Hide default payment approved message when it is not. (#26)

## [3.8.2 (2023-10-27)](3.8.1...3.8.2) ### Added - Hide default payment approved message when it is not.
placetopay · Oct 27, 2023 · 3309ee7 · 3309ee7
1 parent 7e310ec
commit 3309ee7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.8.2 (2023-10-27)](https://github.com/placetopay/prestashop-placetopay/compare/3.8.1...3.8.2)
+
+### Added
+
+- Hide default payment approved message when it is not.
+
 ## [3.8.1 (2023-08-23)](https://github.com/placetopay/prestashop-placetopay/compare/3.8.0...3.8.1)
 
 ### Added

diff --git a/src/Models/PlacetoPayPayment.php b/src/Models/PlacetoPayPayment.php
@@ -107,7 +107,7 @@ class PlacetoPayPayment extends PaymentModule
     const PAGE_HOME = '';
 
     const MIN_VERSION_PS = '1.6.1.0';
-    const MAX_VERSION_PS = '1.7.8.8';
+    const MAX_VERSION_PS = '1.7.8.10';
 
     /**
      * @var string
@@ -122,7 +122,7 @@ class PlacetoPayPayment extends PaymentModule
     public function __construct()
     {
         $this->name = getModuleName();
-        $this->version = '3.8.1';
+        $this->version = '3.8.2';
 
         $this->tab = 'payments_gateways';
 
@@ -2260,6 +2260,7 @@ final private function getStatusPayment(RedirectInformation $response): int
     final private function getPaymentPSEList($customerId)
     {
         $orders = self::getCustomerOrders($customerId);
+        $isPaid = false;
 
         if ($orders) {
             foreach ($orders as &$order) {
@@ -2268,13 +2269,17 @@ final private function getPaymentPSEList($customerId)
                     $order['virtual'] = $myOrder->isVirtual(false);
                 }
             }
+
+            $lastOrder = new Order((int)$orders[0]['id_order']);
+            $isPaid = $lastOrder->getCurrentOrderState()->paid;
         }
 
         $this->context->smarty->assign([
             'orders' => $orders,
             'invoiceAllowed' => (int)Configuration::get('PS_INVOICE'),
             'reorderingAllowed' => !(bool)Configuration::get('PS_DISALLOW_HISTORY_REORDERING'),
-            'slowValidation' => Tools::isSubmit('slowvalidation')
+            'slowValidation' => Tools::isSubmit('slowvalidation'),
+            'isPaid' => $isPaid
         ]);
 
         return $this->display($this->getThisModulePath(), fixPath('/views/templates/front/history.tpl'));

diff --git a/views/templates/front/history.tpl b/views/templates/front/history.tpl
@@ -6,6 +6,13 @@
 {/capture}
 
 <h1 class="page-heading bottom-indent">{l s='Order history'}</h1>
+{if !$isPaid}
+	<style>
+		#content-hook_order_confirmation {
+			display: none;
+		}
+	</style>
+{/if}
 <p class="info-title">{l s='Here are the orders you\'ve placed since your account was created.'}</p>
 {if $slowValidation}
 	<p class="alert alert-warning">{l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}</p>