[MIT-3148] PR review changes

Author: Asmita Tanksale

Cron/OrderSyncStatus.php

@@ -177,7 +177,7 @@ private function sync()
                 if ($isExpired) {
                     $this->syncStatus->cancelOrderInvoice($this->order);
                     $this->order
-                        ->registerCancellation(__('Omise Payments: Payment expired. (cron job sync).'))
+                        ->registerCancellation(__('Omise : Payment expired. (cron job sync).'))
                         ->save();
                 }
             }

Model/SyncStatus.php

@@ -65,7 +65,7 @@ public function sync($order)
         $chargeId = $this->helper->getOrderChargeId($order);
 
         if (!$chargeId) {
-            throw new LocalizedException(__('Unable to find Omise Payments charge ID'));
+            throw new LocalizedException(__('Unable to find Omise charge ID'));
         }
 
         // set the store to fetch configuration values from store specific to the order
@@ -74,7 +74,7 @@ public function sync($order)
 
         switch ($charge['status']) {
             case self::STATUS_SUCCESSFUL:
-                $this->markPaymentSuccessful($order, $charge);
+                $this->maruccessful($order, $charge);
                 break;
             case self::STATUS_FAILED:
                 $this->markPaymentFailed($order, $charge);
@@ -90,7 +90,7 @@ public function sync($order)
                 break;
             default:
                 throw new LocalizedException(
-                    __('Cannot read the payment status. Please try sync again or contact Omise Payments support team
+                    __('Cannot read the payment status. Please try sync again or contact Omise support team
                         at support@omise.co if you have any questions.')
                 );
         }
@@ -101,7 +101,7 @@ public function sync($order)
      * @param array $charge
      * @return void
      */
-    private function markPaymentSuccessful($order, $charge)
+    private function maruccessful($order, $charge)
     {
         $orderStateNotClosed = $order->getState() != Order::STATE_CLOSED;
 
@@ -125,7 +125,7 @@ private function markPaymentSuccessful($order, $charge)
 
             $order->addStatusHistoryComment(
                 __(
-                    'Omise Payments: Payment successful.<br/>An amount %1 %2 has been paid (manual sync).',
+                    'Omise: Payment successful.<br/>An amount %1 %2 has been paid (manual sync).',
                     number_format($order->getGrandTotal(), 2, '.', ''),
                     $order->getOrderCurrencyCode()
                 )
@@ -159,7 +159,7 @@ private function markPaymentFailed($order, $charge)
         $this->cancelOrderInvoice($order);
         $order->registerCancellation(
             __(
-                'Omise Payments: Payment failed.<br/>%1 (code: %2) (manual sync).',
+                'Omise: Payment failed.<br/>%1 (code: %2) (manual sync).',
                 $charge['failure_message'],
                 $charge['failure_code']
             )
@@ -172,8 +172,8 @@ private function markPaymentFailed($order, $charge)
     private function markOrderPending($order)
     {
         $order->addStatusHistoryComment(
-            __('Omise Payments: Payment is still in progress.<br/>
-                You might wait for a moment before click sync the status again or contact Omise Payments support
+            __('Omise: Payment is still in progress.<br/>
+                You might wait for a moment before click sync the status again or contact Omise support
                 team at support@omise.co if you have any questions (manual sync).')
         );
         if ($order->getState() != Order::STATE_PENDING_PAYMENT) {
@@ -188,7 +188,7 @@ private function markOrderPending($order)
     private function markPaymentExpired($order)
     {
         $this->cancelOrderInvoice($order);
-        $order->registerCancellation(__('Omise Payments: Payment expired. (manual sync).'))
+        $order->registerCancellation(__('Omise: Payment expired. (manual sync).'))
             ->save();
     }
 
@@ -198,7 +198,7 @@ private function markPaymentExpired($order)
     private function markPaymentReversed($order)
     {
         $this->cancelOrderInvoice($order);
-        $order->registerCancellation(__('Omise Payments: Payment reversed. (manual sync).'))
+        $order->registerCancellation(__('Omise: Payment reversed. (manual sync).'))
             ->save();
     }
 }

Observer/WebhookObserver/WebhookCompleteObserver.php

@@ -59,7 +59,7 @@ public function execute(Observer $observer)
         }
 
         // To handle the situation where charge is manually updated as successful
-        // from Omise Payments dashboard after the order is canceled.
+        // from Omise dashboard after the order is canceled.
         if ($this->orderData->getState() === MagentoOrder::STATE_CANCELED && $this->charge->isSuccessful()) {
             $this->processCancelledOrder();
         }

Observer/WebhookObserver/WebhookRefundObserver.php

@@ -57,7 +57,7 @@ private function closeOrder()
 
         $this->orderData->addStatusHistoryComment(
             __(
-                "Omise Payments: Payment refunded.<br/>An amount %1 %2 has been {$refundContextText} refunded.",
+                "Omise: Payment refunded.<br/>An amount %1 %2 has been {$refundContextText} refunded.",
                 $this->orderData->getOrderCurrencyCode(),
                 number_format($this->charge->getRefundedAmount(), 2, '.', '')
             )

Plugin/ConfigSectionPaymentPlugin.php

@@ -244,7 +244,7 @@ private function validatePaymentMethods($paymentList, $omiseConfigPaymentList, $
         // show error message by using title from omise helper
         if (! empty($nonSupportPayments)) {
             $this->messageManager->
-                addError(__("This Omise Payments account does not support " . implode(", ", $nonSupportPayments)));
+                addError(__("This Omise account does not support " . implode(", ", $nonSupportPayments)));
         }
         return $data;
     }

etc/adminhtml/system.xml

@@ -18,19 +18,19 @@
                 </field>
                 <field id="test_public_key" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Public key for test</label>
-                    <comment>The "Test" mode public key can be found in Omise Payments Dashboard.</comment>
+                    <comment>The "Test" mode public key can be found in Omise Dashboard.</comment>
                 </field>
                 <field id="test_secret_key" translate="label" type="password" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Secret key for test</label>
-                    <comment>The "Test" mode secret key can be found in Omise Payments Dashboard.</comment>
+                    <comment>The "Test" mode secret key can be found in Omise  Dashboard.</comment>
                 </field>
                 <field id="live_public_key" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Public key for live</label>
-                    <comment>The "Live" mode public key can be found in Omise Payments Dashboard.</comment>
+                    <comment>The "Live" mode public key can be found in Omise  Dashboard.</comment>
                 </field>
                 <field id="live_secret_key" translate="label" type="password" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Secret key for live</label>
-                    <comment>The "Live" mode secret key can be found in Omise Payments Dashboard.</comment>
+                    <comment>The "Live" mode secret key can be found in Omise  Dashboard.</comment>
                 </field>
                 <field id="webhook_status" translate="label comment" type="select" sortOrder="61" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable webhooks</label>