Add refund state configuration keys

sitedata · Jan 19, 2023 · 8a05bf9 · 8a05bf9
1 parent 2244496
commit 8a05bf9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
@@ -747,7 +747,7 @@ public function postProcess()
                     $objOrderReturn = new OrderReturn();
                     $objOrderReturn->id_customer = $order->id_customer;
                     $objOrderReturn->id_order = $order->id;
-                    $objOrderReturn->state = OrderReturnState::ORDER_RETRUN_FIRST_STATUS;
+                    $objOrderReturn->state = Configuration::get('PS_ORS_PENDING');
                     $objOrderReturn->by_admin = 1;
                     $objOrderReturn->question = $refundReason;
                     $objOrderReturn->save();

diff --git a/install/data/xml/configuration.xml b/install/data/xml/configuration.xml
@@ -422,6 +422,15 @@
 	<configuration id="PS_OS_PARTIAL_PAYMENT" name="PS_OS_PARTIAL_PAYMENT">
 		<value>14</value>
 	</configuration>
+	<configuration id="PS_ORS_PENDING" name="PS_ORS_PENDING">
+		<value>1</value>
+	</configuration>
+	<configuration id="PS_ORS_DENIED" name="PS_ORS_DENIED">
+		<value>2</value>
+	</configuration>
+	<configuration id="PS_ORS_REFUNDED" name="PS_ORS_REFUNDED">
+		<value>3</value>
+	</configuration>
 	<configuration id="PS_LEGACY_IMAGES" name="PS_LEGACY_IMAGES">
 		<value>0</value>
 	</configuration>

diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
@@ -28,7 +28,7 @@ public function __construct()
         $this->list_no_link = true;
         $this->context = Context::getContext();
 
-        $this->_select = ' COUNT(IF(a.`state` = '.(int) OrderReturnState::ORDER_RETRUN_FIRST_STATUS.', 1, NULL)) AS total_pending_requests,
+        $this->_select = ' COUNT(IF(a.`state` = '.(int) Configuration::get('PS_ORS_PENDING').', 1, NULL)) AS total_pending_requests,
         ord.`id_currency`, ord.`total_paid_tax_incl` AS total_order, SUM(a.`refunded_amount`) AS refunded_amount, CONCAT(firstname, " ", lastname) AS cust_name, os.`color`, os.`id_order_state`';
         $this->_join .= ' LEFT JOIN `'._DB_PREFIX_.'orders` ord ON (a.`id_order` = ord.`id_order`)';
         $this->_join .= 'LEFT JOIN '._DB_PREFIX_.'order_state os ON (os.`id_order_state` = ord.`current_state`)';
@@ -517,11 +517,11 @@ public function postProcess()
                     }
 
                     // redirect with success if process completed successfully
-                    $confirmation = '4';
-                    if ($idRefundState == 2) {
-                        $confirmation = '101';
-                    } elseif ($idRefundState == 3) {
-                        $confirmation = '102';
+                    $confirmation = 4;
+                    if ($objRefundState->denied) {
+                        $confirmation = 101;
+                    } elseif ($objRefundState->refunded) {
+                        $confirmation = 102;
                     }
                     Tools::redirectAdmin(
                         self::$currentIndex.'&conf='.$confirmation.'&id_order_return='.$idOrderReturn.