-
Notifications
You must be signed in to change notification settings - Fork 21
Feature/mit 3148 omise rebranding #494
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tanksale-asmita
wants to merge
12
commits into
develop
Choose a base branch
from
feature/MIT-3148-Omise-Rebranding
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
90af102
[MIT-3148] Opn to Omise Rebranding Changes
a062e44
[MIT-3148] Rebranding changes added to README.md file
d2944a0
[MIT-3148] Changed logo to Primary dark
618ac1c
[MIT-3148] Updated links in README.md file with Omise domain
ec8f072
[MIT-3148] Removed opn logo image
1ef9675
[MIT-3148] PR review changes added
98ec51d
[MIT-3148] PR review changes
ef11585
[MIT-3148] restored the changed function name
73d16af
Update Cron/OrderSyncStatus.php
tanksale-asmita 9b9c240
Update view/frontend/templates/checkout/onepage/success/paynow_additi…
tanksale-asmita 9c8a2f6
Update etc/adminhtml/system.xml
tanksale-asmita 278e60f
Update Gateway/Command/CreditCardStrategyCommand.php
tanksale-asmita File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,7 +65,7 @@ public function sync($order) | |
| $chargeId = $this->helper->getOrderChargeId($order); | ||
|
|
||
| if (!$chargeId) { | ||
| throw new LocalizedException(__('Unable to find Opn 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 | ||
|
|
@@ -90,7 +90,7 @@ public function sync($order) | |
| break; | ||
| default: | ||
| throw new LocalizedException( | ||
| __('Cannot read the payment status. Please try sync again or contact Opn Payments support team | ||
| __('Cannot read the payment status. Please try sync again or contact Omise support team | ||
| at [email protected] if you have any questions.') | ||
| ); | ||
| } | ||
|
|
@@ -125,7 +125,7 @@ private function markPaymentSuccessful($order, $charge) | |
|
|
||
| $order->addStatusHistoryComment( | ||
| __( | ||
| 'Opn 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( | ||
| __( | ||
| 'Opn 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( | ||
| __('Opn Payments: Payment is still in progress.<br/> | ||
| You might wait for a moment before click sync the status again or contact Opn 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 [email protected] 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(__('Opn 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(__('Opn Payments: Payment reversed. (manual sync).')) | ||
| $order->registerCancellation(__('Omise: Payment reversed. (manual sync).')) | ||
| ->save(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,8 +47,8 @@ class ConfigSectionPaymentPlugin | |
| * @var array | ||
| */ | ||
| private $errorCodes = [ | ||
| 'authentication_failure' => 'The keys for Opn Payments are invalid', | ||
| 'key_expired_error' => 'The keys for Opn Payments are expired.', | ||
| 'authentication_failure' => 'The keys for Omise Payments are invalid', | ||
| 'key_expired_error' => 'The keys for Omise Payments are expired.', | ||
| 'locked_account_error' => 'The account is locked. Please contact [email protected].', | ||
| 'not_authorized' => 'An attempt was made to perform an unauthorized action.', | ||
| ]; | ||
|
|
@@ -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 Opn Payments account does not support " . implode(", ", $nonSupportPayments))); | ||
| addError(__("This Omise account does not support " . implode(", ", $nonSupportPayments))); | ||
| } | ||
| return $data; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: Not sure if this is intentional but there seems to be 2 whitespaces instead of one.