Fix - add shipping VAT to order total - all distributions

Fix - compatibility fix with latest Phoenix distribution

Author: MichaelRotaru

README.md

@@ -8,7 +8,7 @@ Released under the GPL V3 license: https://opensource.org/licenses/GPL-3.0
 
 ## Supported osCommerce versions
 
-*The plugin has been tested with osCommerce v.2.3.4.1 and osCommerce CE Phoenix
+*The plugin has been tested with osCommerce v.2.3.4.1
 
 ## Installation
 

README_CE-Phoenix-2341-Frozen.md

@@ -8,7 +8,7 @@ Released under the GPL V3 license: https://opensource.org/licenses/GPL-3.0
 
 ## Supported osCommerce versions
 
-*The plugin has been tested with osCommerce v.2.3.4.1 and osCommerce CE Phoenix
+*The plugin has been tested with osCommerce v.2.3.4.1 CE Phoenix Frozen distribution
 
 ## Installation
 

README_Phoenix.md

@@ -7,7 +7,7 @@ Released under the GPL V3 license: https://opensource.org/licenses/GPL-3.0
 
 ## Supported osCommerce versions
 
-*The plugin has been tested with osCommerce v.2.3.4.1 and osCommerce CE Phoenix
+*The plugin has been tested with osCommerce CE Phoenix v1.0.7.4
 
 ## Installation
 
@@ -16,18 +16,14 @@ Released under the GPL V3 license: https://opensource.org/licenses/GPL-3.0
   2. Create a live account
   3. Create an app key for your osCommerce website
   4. Upload the files in the `upload` folder to root of your osCommerce store.
-  5. In: `includes/template_top.php` add:
+  5. In: `includes/application_top.php` add:
       ```
-        <?php
-            if ( basename( $PHP_SELF ) == 'checkout_confirmation.php' ) {
-                ?>
-                <script src="https://sdk.paylike.io/3.js"></script>
-                <script src= "includes/javascript/paylike.js"></script>
-                <?php
-              }
-          ?>
-        ```
-     Anywhere betwen the `head` tags.
+      if ( basename( $PHP_SELF ) == 'checkout_confirmation.php' ) {
+        echo '<script src="https://sdk.paylike.io/3.js"></script>';
+        echo '<script src= "includes/javascript/paylike.js"></script>';
+      }
+      ```
+     After the last line.
   6. In: `includes/.htaccess` add:
       ```
       <FilesMatch "paylike.php">

upload/includes/modules/paylike.php

@@ -8,6 +8,15 @@
         require(DIR_WS_CLASSES . 'order.php');
         include(DIR_WS_CLASSES . 'language.php');
         $order = new order;
+
+        // load the selected shipping module
+        require(DIR_WS_CLASSES . 'shipping.php');
+        $shipping_modules = new shipping($shipping);
+
+        require(DIR_WS_CLASSES . 'order_total.php');
+        $order_total_modules = new order_total;
+        $order_total_modules->process();
+
         $next_order_id = tep_db_fetch_array(tep_db_query('select max(orders_id)+1 as max from orders'))['max'];
         $lng = new language;
         $current_lang = array_filter($lng->catalog_languages, function ($lang) use ($languages_id) {
@@ -64,4 +73,4 @@
         jQuery('#payLikeCheckout').remove();
         jQuery('#checkoutButton').removeClass('hidden');
     })
-</script>
+</script>

upload_CE-Phoenix-2341-Frozen/includes/modules/paylike.php

@@ -8,6 +8,15 @@
         require('includes/classes/order.php');
         include('includes/classes/language.php');
         $order = new order;
+
+        // load the selected shipping module
+        require('includes/classes/shipping.php');
+        $shipping_modules = new shipping($shipping);
+
+        require('includes/classes/order_total.php');
+        $order_total_modules = new order_total;
+        $order_total_modules->process();
+
         $next_order_id = tep_db_fetch_array(tep_db_query('select max(orders_id)+1 as max from orders'))['max'];
         $lng = new language;
         $current_lang = array_filter($lng->catalog_languages, function ($lang) use ($languages_id) {

upload_ce_phoenix/includes/modules/paylike.php

@@ -8,6 +8,12 @@
         include($rootPath.'/includes/classes/language.php');
         $order = new order();
 
+        // load the selected shipping module
+        $shipping_modules = new shipping($shipping);
+
+        $order_total_modules = new order_total();
+        $order_total_modules->process();
+
         $next_order_id = tep_db_fetch_array(tep_db_query('select max(orders_id)+1 as max from orders'))['max'];
         $lng = new language;
         $current_lang = array_filter($lng->catalog_languages, function ($lang) use ($languages_id) {

upload_ce_phoenix/includes/modules/payment/paylike.php

@@ -24,7 +24,7 @@ public function __construct()
         $this->appKey = MODULE_PAYMENT_PAYLIKE_TRANSACTION_MODE == 'Test' ? MODULE_PAYMENT_PAYLIKE_TEST_APP_KEY : MODULE_PAYMENT_PAYLIKE_APP_KEY;
         $this->formTitle = $_SESSION['PAYLIKE_TITLE'] = MODULE_PAYMENT_PAYLIKE_TITLE;
         $this->paymentType = MODULE_PAYMENT_PAYLIKE_PAYMENT_TYPE;
-        
+
         if (strpos($_SERVER['REQUEST_URI'], 'action=edit')) {
             echo '<script type="text/javascript" src="includes/modules/payment/paylike/paylike_admin.js"></script>';
             echo '<link rel="stylesheet" type="text/css" href="includes/modules/payment/paylike/paylike_admin.css"/>';
@@ -92,7 +92,7 @@ public function before_process()
     /* After order is processed */
     public function after_process()
     {
-        global $insert_id, $order, $order_totals;
+        global $insert_id, $order;
         /* If 'Instant' payment, capture  transaction via Paylike API */
         if ($this->paymentType === 'Instant') {
             /* If transaction succeed */
@@ -101,9 +101,8 @@ public function after_process()
                 $descriptor = "Order #$insert_id";
                 /* Init Paylike API */
                 require('includes/classes/paylike/init.php');
-
                 $paylike = new \Paylike\Paylike($this->appKey);
-                $amount = end($order_totals);
+                $amount = end($this->getOrderTotalsSummary());
                 $apps = $paylike->transactions();
                 $apps->capture($transactionId, [
                     'amount' => (float)number_format($amount['value'] * $order->info['currency_value'], 2, '.', '') * 100,
@@ -115,6 +114,28 @@ public function after_process()
         return false;
     }
 
+    function getOrderTotalsSummary() {
+      $order_totals = [];
+      foreach (($GLOBALS['order_total_modules']->modules ?? []) as $value) {
+        $class = pathinfo($value, PATHINFO_FILENAME);
+        if ($GLOBALS[$class]->enabled) {
+          foreach ($GLOBALS[$class]->output as $module) {
+            if (tep_not_null($module['title']) && tep_not_null($module['text'])) {
+              $order_totals[] = [
+                'code' => $GLOBALS[$class]->code,
+                'title' => $module['title'],
+                'text' => $module['text'],
+                'value' => $module['value'],
+                'sort_order' => $GLOBALS[$class]->sort_order,
+              ];
+            }
+          }
+        }
+      }
+
+      return $order_totals;
+    }
+
     /* Define module admin fields */
     protected function get_parameters()
     {