Merge pull request #225 from magmodules/release/1.18.3

Release/1.18.3
magmodules · Jun 7, 2024 · 49e84cb · 49e84cb
2 parents a703a08 + bd789a2
commit 49e84cb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/setup-upgrade.yml b/.github/workflows/setup-upgrade.yml
@@ -16,6 +16,8 @@ jobs:
             MAGENTO_VERSION: 2.4.4
           - PHP_VERSION: php82-fpm
             MAGENTO_VERSION: 2.4.6
+          - PHP_VERSION: php83-fpm
+            MAGENTO_VERSION: 2.4.7
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/Controller/Adminhtml/Log/Stream.php b/Controller/Adminhtml/Log/Stream.php
@@ -23,7 +23,7 @@ class Stream extends Action
      *
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magmodules_Channable::config';
+    public const ADMIN_RESOURCE = 'Magmodules_Channable::configuration';
 
     /**
      * @var JsonFactory

diff --git a/Service/Order/Items/Add.php b/Service/Order/Items/Add.php
@@ -125,7 +125,7 @@ public function execute(Quote $quote, array $data, StoreInterface $store, bool $
                 $product = $this->getProductById((int)$item['id'], (int)$store->getStoreId());
                 $price = $this->getProductPrice($item, $product, $store, $quote, $isBusinessOrder);
                 $product = $this->setProductData($product, $price, $store, $lvbOrder);
-                if ($isBusinessOrder) {
+                if ($isBusinessOrder && (isset($item['price_tax']) && $item['price_tax'] == 0)) {
                     $product->setTaxClassId(0);
                 }
 

diff --git a/Service/Order/Process/CreateInvoice.php b/Service/Order/Process/CreateInvoice.php
@@ -93,6 +93,11 @@ public function execute(OrderInterface $order)
             $invoice = $this->invoiceService->prepareInvoice($order);
             $invoice->setRequestedCaptureCase(Invoice::CAPTURE_OFFLINE);
             $invoice->setTransactionFee($order->getTransactionFee());
+            $invoice->setDiscountAmount($order->getDiscountAmount());
+            $invoice->setBaseDiscountAmount($order->getDiscountAmount());
+            $invoice->setDiscountDescription($order->getDiscountDescription());
+            $invoice->setGrandTotal($order->getGrandTotal());
+            $invoice->setBaseGrandTotal($order->getBaseGrandTotal());
             $invoice->register();
 
             $this->transaction->addObject($invoice);

diff --git a/Service/Product/InventoryData.php b/Service/Product/InventoryData.php
@@ -119,7 +119,7 @@ private function getReservations(array $skus, int $stockId): void
 
         $reservations = $connection->fetchAll($select);
         foreach ($reservations as $reservation) {
-            $this->reservation[$stockId][$reservation['sku']] = $reservation['quantity'];
+            $this->reservation[$stockId][$reservation['sku']] = max(0, $reservation['quantity'] * -1);
         }
     }
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-channable",
     "description": "Channable integration for Magento 2",
     "type": "magento2-module",
-    "version": "1.18.2",
+    "version": "1.18.3",
     "license": "BSD-2-Clause",
     "homepage": "https://github.com/magmodules/magento2-channable",
     "require": {

diff --git a/etc/config.xml b/etc/config.xml
@@ -12,7 +12,7 @@
             <general>
                 <enable>0</enable>
                 <limit>250</limit>
-                <version>v1.18.2</version>
+                <version>v1.18.3</version>
             </general>
             <data>
                 <name_attribute>name</name_attribute>