Merge pull request #27 from donmo-roundup/feat/multicurrency-support

Feat/multicurrency support
donmo-roundup · Sep 11, 2023 · 92c39fa · 92c39fa
2 parents 33356f4 + 47955b3
commit 92c39fa
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 15 deletions.
diff --git a/Api/Data/DonationInterface.php b/Api/Data/DonationInterface.php
@@ -13,6 +13,7 @@ interface DonationInterface
      */
     const DONATION_ID = 'donation_id';
     const DONATION_AMOUNT = 'donation_amount';
+    const DONATION_CURRENCY = 'currency';
     const STATUS = 'status';
     const MODE = 'mode';
     const MASKED_QUOTE_ID = 'masked_quote_id';
@@ -50,6 +51,21 @@ public function getDonationAmount(): float;
      */
     public function setDonationAmount(float $donationAmount);
 
+    /**
+     * Get Donation Currency
+     *
+     * @return string
+     */
+    public function getCurrency(): string;
+
+    /**
+     * Set Donation Currency
+     *
+     * @param string $currency
+     * @return $this
+     */
+    public function setCurrency($currency);
+
     /**
      * Get Status
      *

diff --git a/Block/Checkout/LayoutProcessor/DonmoConfig.php b/Block/Checkout/LayoutProcessor/DonmoConfig.php
@@ -32,6 +32,7 @@ public function process($jsLayout)
             ['children']['donmo-block']['donmoConfig'] = [
                 'publicKey' => $this->donmoConfig->getPublicKey($this->mode),
                 'language' => $this->donmoConfig->getLanguageCode(),
+                'currency' => $this->donmoConfig->getCurrencyCode(),
                 'integrationTitle' => $this->donmoConfig->getIntegrationTitle(),
                 'roundupMessage' => $this->donmoConfig->getRoundupMessage(),
                 'thankMessage' => $this->donmoConfig->getThankMessage(),

diff --git a/Model/Config.php b/Model/Config.php
@@ -4,6 +4,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Locale\Resolver as LocaleResolver;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Config
 {
@@ -17,16 +18,21 @@ class Config
 
     private ScopeConfigInterface $scopeConfig;
     private LocaleResolver $localeResolver;
+    private StoreManagerInterface $storeManager;
 
     /**
      * Config constructor.
      *
      * @param ScopeConfigInterface $scopeConfig
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, LocaleResolver $localeResolver)
-    {
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        LocaleResolver $localeResolver,
+        StoreManagerInterface $storeManager
+    ) {
         $this->scopeConfig = $scopeConfig;
         $this->localeResolver = $localeResolver;
+        $this->storeManager = $storeManager;
     }
 
     public function getCurrentMode(): string
@@ -79,4 +85,9 @@ public function getLanguageCode() : string
         $languageCode = strstr($currentLocaleCode, '_', true);
         return $languageCode;
     }
+
+    public function getCurrencyCode() : string
+    {
+        return $this->storeManager->getStore()->getCurrentCurrencyCode();
+    }
 }
diff --git a/Model/Donation.php b/Model/Donation.php
@@ -56,6 +56,27 @@ public function setDonationAmount($donationAmount)
         return $this->setData(self::DONATION_AMOUNT, $donationAmount);
     }
 
+    /**
+     * Get Currency
+     *
+     * @return string
+     */
+    public function getCurrency(): string
+    {
+        return $this->getData(self::DONATION_CURRENCY);
+    }
+
+    /**
+     * Set Status
+     *
+     * @param string $currency
+     * @return $this
+     */
+    public function setCurrency($currency)
+    {
+        return $this->setData(self::DONATION_CURRENCY, $currency);
+    }
+
     /**
      * Get Status
      *

diff --git a/Model/DonationManagement.php b/Model/DonationManagement.php
@@ -65,13 +65,15 @@ public function createDonation(Order $order): void
         $quoteId = $order->getQuoteId();
         $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
         $currentMode = $this->donmoConfig->getCurrentMode();
+        $currency = $order->getOrderCurrency()->getCurrencyCode();
 
         if ($donationAmount) {
             $donation = $this->donationFactory->create();
             $donation
                 ->setOrderId($orderId)
                 ->setMaskedQuoteId($maskedId)
                 ->setDonationAmount($donationAmount)
+                ->setCurrency($currency)
                 ->setMode($currentMode)
                 ->setStatus(self::STATUS_PENDING);
 

diff --git a/Model/GuestCartDonationManagement.php b/Model/GuestCartDonationManagement.php
@@ -28,7 +28,6 @@ public function __construct(
      */
     public function addDonationToCart(string $cartId, float $donationAmount): string
     {
-        $this->logger->info('addDonationToCart guest');
         return $this->cartDonationManagement->addDonationToCart($this->maskedQuoteIdToQuoteId->execute($cartId), $donationAmount);
     }
 

diff --git a/ViewModel/Cart/Donmo.php b/ViewModel/Cart/Donmo.php
@@ -29,6 +29,7 @@ public function getDonmoConfig(): string
         $this->json->serialize([
             'publicKey' => $this->donmoConfig->getPublicKey($this->mode),
             'language' => $this->donmoConfig->getLanguageCode(),
+            'currency' => $this->donmoConfig->getCurrencyCode(),
             'integrationTitle' => $this->donmoConfig->getIntegrationTitle(),
             'roundupMessage' => $this->donmoConfig->getRoundupMessage(),
             'thankMessage' => $this->donmoConfig->getThankMessage(),

diff --git a/etc/db_schema.xml b/etc/db_schema.xml
@@ -11,6 +11,8 @@
         <column xsi:type="decimal" name="donation_amount"  scale="2" precision="20" unsigned="false"
                 comment="Donation Amount"/>
 
+        <column xsi:type="varchar" name="currency" length="3" comment="Donation Currency"/>
+
         <column xsi:type="varchar" name="status" length="32" default="PENDING" comment="Status"/>
 
         <column xsi:type="varchar" name="mode" length="32" comment="Mode"/>

diff --git a/lib/ApiService.php b/lib/ApiService.php
@@ -31,7 +31,8 @@ private function generatePayload(array $donations): array
             $payload[] = [
                 'donationAmount' => $donation->getDonationAmount(),
                 'createdAt' => $donation->getCreatedAt(),
-                'orderId' => $donation->getMaskedQuoteId()
+                'orderId' => $donation->getMaskedQuoteId(),
+                'currency' => $donation->getCurrency()
             ];
         }
         return $payload;
@@ -46,13 +47,13 @@ public function createAndConfirmDonations($mode, array $donations): int
     {
         $sk = $this->donmoConfig->getSecretKey($mode);
 
-        $url = Donmo::$apiBase . '/donations/confirm';
+        $url = Donmo::$apiBase . '/donations';
 
         $ch = curl_init();
-        $headers = array(
+        $headers = [
             'Content-Type: application/json',
             "sk: $sk"
-        );
+        ];
 
         $payload = $this->generatePayload($donations);
         $body = json_encode(['donations' => $payload]);
@@ -84,10 +85,10 @@ public function deleteDonation($donationMode, $id): int
         $url = Donmo::$apiBase . "/donations/{$id}";
 
         $ch = curl_init();
-        $headers = array(
+        $headers = [
             'Content-Type: application/json',
             "sk: $sk"
-        );
+        ];
 
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');

diff --git a/lib/Donmo.php b/lib/Donmo.php
@@ -4,5 +4,5 @@
 
 class Donmo
 {
-    public static string $apiBase = 'https://api.donmo.org/v1/ua';
+    public static string $apiBase = 'https://api.donmo.org/v1';
 }
diff --git a/view/adminhtml/ui_component/donmo_report.xml b/view/adminhtml/ui_component/donmo_report.xml
@@ -103,7 +103,6 @@
         </column>
 
         <column name="donation_amount"
-                class="Magento\Sales\Ui\Component\Listing\Column\Price"
                 sortOrder="24">
             <settings>
                 <filter>text</filter>
@@ -112,10 +111,19 @@
             </settings>
         </column>
 
+        <column name="currency"
+                sortOrder="25">
+            <settings>
+                <filter>text</filter>
+                <dataType>text</dataType>
+                <label>Donation Currency</label>
+            </settings>
+        </column>
+
         <column name="created_at"
                 class="Magento\Ui\Component\Listing\Columns\Date"
                 component="Magento_Ui/js/grid/columns/date"
-                sortOrder="25">
+                sortOrder="26">
             <settings>
                 <filter>text</filter>
                 <dataType>text</dataType>
@@ -126,7 +134,7 @@
         <column name="updated_at"
                 class="Magento\Ui\Component\Listing\Columns\Date"
                 component="Magento_Ui/js/grid/columns/date"
-                sortOrder="26"
+                sortOrder="27"
         >
             <settings>
                 <filter>text</filter>
@@ -137,7 +145,7 @@
 
         <column name="mode"
                 component="Magento_Ui/js/grid/columns/select"
-                sortOrder="27">
+                sortOrder="28">
             <settings>
                 <options class="Donmo\Roundup\Ui\Component\Listing\Column\Mode"/>
                 <filter>select</filter>
@@ -149,7 +157,7 @@
         <column
             name="status"
             component="Magento_Ui/js/grid/columns/select"
-            sortOrder="28"
+            sortOrder="29"
         >
             <settings>
                 <options class="Donmo\Roundup\Ui\Component\Listing\Column\Status"/>

diff --git a/view/frontend/web/js/view/cart/donmo-block.js b/view/frontend/web/js/view/cart/donmo-block.js
@@ -54,6 +54,7 @@ define([
                     isBackendBased: true,
                     elementId: 'donmo-roundup',
                     language: this.donmoConfig.language,
+                    currency: this.donmoConfig.currency,
                     orderId: quote.getQuoteId(),
                     integrationTitle: this.donmoConfig.integrationTitle,
                     roundupMessage: this.donmoConfig.roundupMessage,

diff --git a/view/frontend/web/js/view/checkout/summary/donmo-block.js b/view/frontend/web/js/view/checkout/summary/donmo-block.js
@@ -54,6 +54,7 @@ define([
                     isBackendBased: true,
                     elementId: 'donmo-roundup',
                     language: this.donmoConfig.language,
+                    currency: this.donmoConfig.currency,
                     orderId: quote.getQuoteId(),
                     integrationTitle: this.donmoConfig.integrationTitle,
                     roundupMessage: this.donmoConfig.roundupMessage,