Merge branch 'feature/discount-and-fee' into feature/layout-front

opencart-extension · Sep 2, 2020 · a989ecc · a989ecc
2 parents e136c1b + ffa570d
commit a989ecc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/upload/catalog/model/extension/total/pagseguro_discount.php b/upload/catalog/model/extension/total/pagseguro_discount.php
@@ -2,9 +2,10 @@
 
 class ModelExtensionTotalPagSeguroDiscount extends Model
 {
+    const EXTENSION_PAYMENT_PREFIX = 'payment_pagseguro_';
     const EXTENSION_PAGSEGURO_BOLETO = 'pagseguro_boleto';
     const EXTENSION_PAGSEGURO_CREDIT = 'pagseguro_credit';
-    const EXTENSION_PAGSEGURO_DEBIT = 'pagseguro_debit';
+    const EXTENSION_PAGSEGURO_DEBIT = 'pagseguro_zdebit';
 
     public function getTotal($total) {
         $status_key = self::EXTENSION_PAYMENT_PREFIX . 'status';
@@ -41,7 +42,7 @@ public function getTotal($total) {
      */
     private function getDiscountValue(): float
     {
-        switch ($this->session->data['payment_method']) {
+        switch ($this->session->data['payment_method']['code']) {
             case self::EXTENSION_PAGSEGURO_BOLETO:
                 return floatval($this->config->get(self::EXTENSION_PAYMENT_PREFIX . 'discount_boleto'));
             break;

diff --git a/upload/catalog/model/extension/total/pagseguro_fee.php b/upload/catalog/model/extension/total/pagseguro_fee.php
@@ -3,9 +3,9 @@
 class ModelExtensionTotalPagSeguroFee extends Model
 {
     const EXTENSION_PAYMENT_PREFIX = 'payment_pagseguro_';
-    const EXTENSION_PAGSEGURO_BOLETO = self::EXTENSION_PAYMENT_PREFIX . 'boleto';
-    const EXTENSION_PAGSEGURO_CREDIT = self::EXTENSION_PAYMENT_PREFIX . 'credit';
-    const EXTENSION_PAGSEGURO_DEBIT = self::EXTENSION_PAYMENT_PREFIX . 'debit';
+    const EXTENSION_PAGSEGURO_BOLETO = 'pagseguro_boleto';
+    const EXTENSION_PAGSEGURO_CREDIT = 'pagseguro_credit';
+    const EXTENSION_PAGSEGURO_DEBIT = 'pagseguro_zdebit';
 
     public function getTotal($total) {
         $status_key = self::EXTENSION_PAYMENT_PREFIX . 'status';
@@ -42,7 +42,7 @@ public function getTotal($total) {
      */
     private function getFeeValue(): float
     {
-        switch ($this->session->data['payment_method']) {
+        switch ($this->session->data['payment_method']['code']) {
             case self::EXTENSION_PAGSEGURO_BOLETO:
                 return floatval($this->config->get(self::EXTENSION_PAYMENT_PREFIX . 'fee_boleto'));
             break;