(PO-209)(Opencart 4.0.1.1 support) #171
Conversation
catalog/model/payment/razorpay.php
Outdated
| @@ -328,7 +349,11 @@ public function recurringPayments() | |||
|
|
|||
| public function createOCSubscription($subscriptionData) | |||
| { | |||
| $query = "INSERT INTO `" . DB_PREFIX . "order_subscription` SET `order_product_id` = :order_product_id,"; | |||
| if (VERSION >= '4.0.2.0') { | |||
There was a problem hiding this comment.
@rohitcbr are we supporting subscription
There was a problem hiding this comment.
@abdulwahidsharief updated
| @@ -515,7 +529,7 @@ public function getSubscription() | |||
| 'total' => $subscription_total, | |||
| 'page' => $page, | |||
| 'limit' => 10, | |||
| 'url' => $this->url->link('extension/razorpay/payment/razorpay.getSubscription', 'user_token=' . $this->session->data['user_token'] . $url . '&page={page}', true) | |||
| 'url' => $this->url->link('extension/razorpay/payment/razorpay' . $this->separator . 'getSubscription', 'user_token=' . $this->session->data['user_token'] . $url . '&page={page}', true) | |||
There was a problem hiding this comment.
@rohitcbr separator not required here as we are not providing subscription
There was a problem hiding this comment.
@abdulwahidsharief updated
| @@ -190,7 +190,11 @@ public function index(): string { | |||
| $data['phone'] = $order_info['telephone']; | |||
| $data['name'] = $this->config->get('config_name'); | |||
| $data['lang'] = $this->config->get('language_code'); | |||
| $data['return_url'] = $this->url->link('extension/razorpay/payment/razorpay.callback', '', 'true'); | |||
| if (VERSION >= '4.0.2.0') { | |||
There was a problem hiding this comment.
@rohitcbr add separator instead of condition
There was a problem hiding this comment.
@abdulwahidsharief updated
| @@ -142,6 +143,24 @@ | |||
| </div> | |||
| </div> | |||
| </div> | |||
| {% else %} | |||
| <div class="form-group" style="display: none;"> | |||
There was a problem hiding this comment.
@rohitcbr are we loading subscription and hiding for version < 4.0.2.0
There was a problem hiding this comment.
@abdulwahidsharief removed the else part and handled with isset
| @@ -190,7 +198,7 @@ public function index(): string { | |||
| $data['phone'] = $order_info['telephone']; | |||
| $data['name'] = $this->config->get('config_name'); | |||
| $data['lang'] = $this->config->get('language_code'); | |||
| $data['return_url'] = $this->url->link('extension/razorpay/payment/razorpay.callback', '', 'true'); | |||
| $data['return_url'] = $this->url->link('extension/razorpay/payment/razorpay' . $this->separator . 'callback', '', 'true'); | |||
There was a problem hiding this comment.
@rohitcbr fix indentation
There was a problem hiding this comment.
@abdulwahidsharief updated
Note :- Please follow the below points while attaching test cases document link below:
- If label
Testedis added then test cases document URL is mandatory.- Link added should be a valid URL and accessible throughout the org.
- If the branch name contains hotfix / revert by default the BVT workflow check will pass.