Merge pull request #143 from margud/support

3.4.7 release
mollie · Nov 29, 2019 · 5363552 · 5363552
2 parents 62734e2 + a67acc6
commit 5363552
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 51 deletions.
diff --git a/controllers/front/payment.php b/controllers/front/payment.php
@@ -83,7 +83,7 @@ public function initContent()
         }
 
         $method = Tools::getValue('method');
-        if (in_array($method, array('cartasi', 'cartesbancaires'))) {
+        if (in_array($method, array('cartesbancaires'))) {
             $method = 'creditcard';
         }
         $issuer = Tools::getValue('issuer') ?: null;

diff --git a/mollie.php b/mollie.php
@@ -79,7 +79,6 @@ class Mollie extends PaymentModule
         'banktransfer'    => array('eur'),
         'belfius'         => array('eur'),
         'bitcoin'         => array('eur'),
-        'cartasi'         => array('eur'),
         'cartesbancaires' => array('eur'),
         'creditcard'      => array('aud', 'bgn', 'cad', 'chf', 'czk', 'dkk', 'eur', 'gbp', 'hkd', 'hrk', 'huf', 'ils', 'isk', 'jpy', 'pln', 'ron', 'sek', 'usd'),
         'directdebit'     => array('eur'),
@@ -125,7 +124,6 @@ class Mollie extends PaymentModule
         'bitcoin'         => array(),
         'paysafecard'     => array(),
         'banktransfer'    => array(),
-        'cartasi'         => array('it'),
         'cartesbancaires' => array('fr'),
         'directdebit'     => array(
             'fi', 'at', 'pt', 'be', 'bg', 'es', 'hr', 'cy', 'cz', 'dk', 'ee', 'fr', 'gf', 'de', 'gi', 'gr', 'gp', 'gg', 'hu',
@@ -239,7 +237,6 @@ class Mollie extends PaymentModule
         'banktransfer'    => 'Bank',
         'belfius'         => 'Belfius',
         'bitcoin'         => 'Bitcoin',
-        'cartasi'         => 'CartaSi',
         'cartesbancaires' => 'Cartes Bancaires',
         'creditcard'      => 'Credit Card',
         'directdebit'     => 'Direct Debit',
@@ -270,7 +267,7 @@ public function __construct()
     {
         $this->name = 'mollie';
         $this->tab = 'payments_gateways';
-        $this->version = '3.4.6';
+        $this->version = '3.4.7';
         $this->author = 'Mollie B.V.';
         $this->need_instance = 1;
         $this->bootstrap = true;
@@ -361,7 +358,6 @@ public function __construct()
             'Awaiting Mollie payment'                                                                                                         => $this->l('Awaiting Mollie payment'),
             'Mollie partially refunded'                                                                                                       => $this->l('Mollie partially refunded'),
             'iDEAL'                                                                                                                           => $this->l('iDEAL'),
-            'CartaSi'                                                                                                                         => $this->l('CartaSi'),
             'Cartes Bancaires'                                                                                                                => $this->l('Cartes Bancaires'),
             'Credit card'                                                                                                                     => $this->l('Credit card'),
             'Bancontact'                                                                                                                      => $this->l('Bancontact'),
@@ -1445,7 +1441,6 @@ protected function getConfigFieldsValues()
             static::MOLLIE_STATUS_OPEN           => Configuration::get(static::MOLLIE_STATUS_OPEN),
             static::MOLLIE_STATUS_PAID           => Configuration::get(static::MOLLIE_STATUS_PAID),
             static::MOLLIE_STATUS_CANCELED       => Configuration::get(static::MOLLIE_STATUS_CANCELED),
-            static::MOLLIE_STATUS_CANCELED       => Configuration::get(static::MOLLIE_STATUS_CANCELED),
             static::MOLLIE_STATUS_EXPIRED        => Configuration::get(static::MOLLIE_STATUS_EXPIRED),
             static::MOLLIE_STATUS_PARTIAL_REFUND => Configuration::get(static::MOLLIE_STATUS_PARTIAL_REFUND),
             static::MOLLIE_STATUS_REFUNDED       => Configuration::get(static::MOLLIE_STATUS_REFUNDED),
@@ -3665,7 +3660,7 @@ public function getMethodsForConfig($active = false)
             return (array) $apiMethod;
         }, $apiMethods), 'id');
         if (in_array('creditcard', $availableApiMethods)) {
-            foreach (array('cartasi' => 'CartaSi', 'cartesbancaires' => 'Cartes Bancaires') as $id => $name) {
+            foreach (array('cartesbancaires' => 'Cartes Bancaires') as $id => $name) {
                 if (!in_array($id, array_column($dbMethods, 'id'))) {
                     $deferredMethods[] = array(
                         'id'        => $id,
@@ -4626,18 +4621,18 @@ public function validateMollieOrder(
                     $amountPaid = !$dontTouchAmount ? Tools::ps_round((float) $amountPaid, 2) : $amountPaid;
                     $order->total_paid_real = 0;
                     $order->total_products = (float) $this->context->cart->getOrderTotal(false, Cart::ONLY_PRODUCTS, $order->product_list, $idCarrier);
-                    $order->total_products_wt = (float) $this->context->cart->getOrderTotal($withTaxes, Cart::ONLY_PRODUCTS, $order->product_list, $idCarrier);
+                    $order->total_products_wt = (float) $this->context->cart->getOrderTotal(true, Cart::ONLY_PRODUCTS, $order->product_list, $idCarrier);
                     $order->total_discounts_tax_excl = (float) abs($this->context->cart->getOrderTotal(false, Cart::ONLY_DISCOUNTS, $order->product_list, $idCarrier));
-                    $order->total_discounts_tax_incl = (float) abs($this->context->cart->getOrderTotal($withTaxes, Cart::ONLY_DISCOUNTS, $order->product_list, $idCarrier));
+                    $order->total_discounts_tax_incl = (float) abs($this->context->cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS, $order->product_list, $idCarrier));
                     $order->total_discounts = $order->total_discounts_tax_incl;
                     $order->total_shipping_tax_excl = (float) $this->context->cart->getPackageShippingCost((int) $idCarrier, false, null, $order->product_list);
-                    $order->total_shipping_tax_incl = (float) $this->context->cart->getPackageShippingCost((int) $idCarrier, $withTaxes, null, $order->product_list);
+                    $order->total_shipping_tax_incl = (float) $this->context->cart->getPackageShippingCost((int) $idCarrier, true, null, $order->product_list);
                     $order->total_shipping = $order->total_shipping_tax_incl;
                     if (!is_null($carrier) && Validate::isLoadedObject($carrier)) {
                         $order->carrier_tax_rate = $carrier->getTaxesRate(new Address((int) $this->context->cart->{Configuration::get('PS_TAX_ADDRESS_TYPE')}));
                     }
                     $order->total_wrapping_tax_excl = (float) abs($this->context->cart->getOrderTotal(false, Cart::ONLY_WRAPPING, $order->product_list, $idCarrier));
-                    $order->total_wrapping_tax_incl = (float) abs($this->context->cart->getOrderTotal($withTaxes, Cart::ONLY_WRAPPING, $order->product_list, $idCarrier));
+                    $order->total_wrapping_tax_incl = (float) abs($this->context->cart->getOrderTotal(true, Cart::ONLY_WRAPPING, $order->product_list, $idCarrier));
                     $order->total_wrapping = $order->total_wrapping_tax_incl;
                     $order->total_paid_tax_excl = (float) Tools::ps_round((float) $this->context->cart->getOrderTotal(false, Cart::BOTH, $order->product_list, $idCarrier), self::PS_PRICE_COMPUTE_PRECISION);
                     $order->total_paid_tax_incl = (float) Tools::ps_round((float) $this->context->cart->getOrderTotal(true, Cart::BOTH, $order->product_list, $idCarrier), self::PS_PRICE_COMPUTE_PRECISION);

diff --git a/views/js/src/back/transaction/components/orderlines/OrderLinesInfo.tsx b/views/js/src/back/transaction/components/orderlines/OrderLinesInfo.tsx
@@ -30,7 +30,7 @@
  * @package    Mollie
  * @link       https://www.mollie.nl
  */
-import React, { ReactElement, useCallback } from 'react';
+import React, {ReactElement, useCallback, useState} from 'react';
 import styled from 'styled-components';
 
 import OrderLinesTable from '@transaction/components/orderlines/OrderLinesTable';
@@ -53,11 +53,11 @@ const Div = styled.div`
 ` as any;
 
 export default function OrderLinesInfo(): ReactElement<{}> {
-  const { translations, order, config: { legacy } }: IProps = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, order, config: { legacy } }: IProps = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     order: state.order,
     config: state.config,
-  })), []);
+  }));
 
   if (legacy) {
     return (

diff --git a/views/js/src/back/transaction/components/orderlines/OrderLinesTable.tsx b/views/js/src/back/transaction/components/orderlines/OrderLinesTable.tsx
@@ -57,15 +57,14 @@ const TableContainer = styled.div`
 
 export default function OrderLinesTable(): ReactElement<{}> {
   const [loading, setLoading] = useState<boolean>(false);
-  const { translations, order, currencies, config: { legacy }, config, viewportWidth }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, order, currencies, config: { legacy }, config, viewportWidth }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     order: state.order,
     currencies: state.currencies,
     translations: state.translations,
     config: state.config,
     viewportWidth: state.viewportWidth,
-  })), []);
+  }));
   const dispatch = useDispatch();
-  const _dispatchUpdateOrder = (order: IMollieApiOrder) => useCallback(() => dispatch(updateOrder(order)), []);
 
   async function _ship(origLines: Array<IMollieOrderLine>): Promise<void> {
     let lines = null;
@@ -131,7 +130,7 @@ export default function OrderLinesTable(): ReactElement<{}> {
           setLoading(true);
           const { success, order: newOrder } = await shipOrder(order.id, lines, tracking);
           if (success) {
-            _dispatchUpdateOrder(newOrder);
+            dispatch(updateOrder(newOrder));
           } else {
             import(/* webpackPrefetch: true, webpackChunkName: "sweetalert" */ 'sweetalert').then(({ default: swal }) => {
               swal({
@@ -185,7 +184,7 @@ export default function OrderLinesTable(): ReactElement<{}> {
         setLoading(true);
         const { success, order: newOrder } = await refundOrder(order.id, lines);
         if (success) {
-          _dispatchUpdateOrder(newOrder);
+          dispatch(updateOrder(newOrder));
         } else {
           import(/* webpackPrefetch: true, webpackChunkName: "sweetalert" */ 'sweetalert').then(({ default: swal }) => {
             swal({
@@ -239,7 +238,7 @@ export default function OrderLinesTable(): ReactElement<{}> {
         setLoading(true);
         const { success, order: newOrder } = await cancelOrder(order.id, lines);
         if (success) {
-          _dispatchUpdateOrder(newOrder);
+          dispatch(updateOrder(newOrder));
         } else {
           swal({
             icon: 'error',

diff --git a/views/js/src/back/transaction/components/orderlines/OrderLinesTableFooter.tsx b/views/js/src/back/transaction/components/orderlines/OrderLinesTableFooter.tsx
@@ -51,11 +51,11 @@ interface IProps {
 }
 
 export default function OrderLinesTableFooter({ loading, ship, cancel, refund }: IProps): ReactElement<{}> {
-  const { translations, order, config: { legacy } }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, order, config: { legacy } }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     order: state.order,
     config: state.config,
-  })), []);
+  }));
 
   function isCancelable(): boolean {
     for (let line of Object.values(order.lines.filter(line => line.type !== 'discount'))) {

diff --git a/views/js/src/back/transaction/components/orderlines/PaymentInfo.tsx b/views/js/src/back/transaction/components/orderlines/PaymentInfo.tsx
@@ -44,12 +44,12 @@ const Div = styled.div`
 ` as any;
 
 export default function PaymentInfo(): ReactElement<{}> {
-  const { translations, config: { legacy } }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, config: { legacy } }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     order: state.order,
     currencies: state.currencies,
     config: state.config,
-  })), []);
+  }));
 
   if (legacy) {
     return (

diff --git a/views/js/src/back/transaction/components/orderlines/PaymentInfoContent.tsx b/views/js/src/back/transaction/components/orderlines/PaymentInfoContent.tsx
@@ -38,12 +38,12 @@ import { formatCurrency } from '@shared/tools';
 import { useMappedState } from 'redux-react-hook';
 
 export default function PaymentInfoContent(): ReactElement<{}> {
-  const { translations, order, currencies, config: { legacy } }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, order, currencies, config: { legacy } }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     order: state.order,
     currencies: state.currencies,
     translations: state.translations,
     config: state.config,
-  })), []);
+  }));
 
   return (
     <>

diff --git a/views/js/src/back/transaction/components/refund/EmptyRefundTable.tsx b/views/js/src/back/transaction/components/refund/EmptyRefundTable.tsx
@@ -36,9 +36,9 @@ import RefundTableHeader from '@transaction/components/refund/RefundTableHeader'
 import { useMappedState } from 'redux-react-hook';
 
 export default function EmptyRefundTable(): ReactElement<{}> {
-  const { translations }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations
-  })), []);
+  }));
 
   return (
     <div className="table-responsive">

diff --git a/views/js/src/back/transaction/components/refund/PartialRefundButton.tsx b/views/js/src/back/transaction/components/refund/PartialRefundButton.tsx
@@ -42,10 +42,10 @@ interface IProps {
 }
 
 export default function PartialRefundButton({ loading, disabled, refundPayment }: IProps): ReactElement<{}> {
-  const { translations, config: { legacy } }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, config: { legacy } }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     config: state.config,
-  })), []);
+  }));
 
   const content = (
     <button

diff --git a/views/js/src/back/transaction/components/refund/PaymentInfo.tsx b/views/js/src/back/transaction/components/refund/PaymentInfo.tsx
@@ -44,10 +44,10 @@ const Div = styled.div`
 ` as any;
 
 export default function PaymentInfo(): ReactElement<{}> {
-  const { translations, config: { legacy } } = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, config: { legacy } } = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     config: state.config,
-  })), []);
+  }));
 
   if (legacy) {
     return (

diff --git a/views/js/src/back/transaction/components/refund/PaymentInfoContent.tsx b/views/js/src/back/transaction/components/refund/PaymentInfoContent.tsx
@@ -38,12 +38,12 @@ import { useMappedState } from 'redux-react-hook';
 import { formatCurrency } from '@shared/tools';
 
 export default function PaymentInfoContent(): ReactElement<{}> {
-  const { translations, payment, currencies, config: { legacy } }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, payment, currencies, config: { legacy } }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     payment: state.payment,
     currencies: state.currencies,
     translations: state.translations,
     config: state.config,
-  })), []);
+  }));
 
   return (
     <>

diff --git a/views/js/src/back/transaction/components/refund/RefundButton.tsx b/views/js/src/back/transaction/components/refund/RefundButton.tsx
@@ -41,9 +41,9 @@ interface IProps {
 }
 
 export default function RefundButton({ loading, disabled, refundPayment }: IProps): ReactElement<{}> {
-  const { translations,  }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations,  }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
-  })), []);
+  }));
 
   return (
     <button

diff --git a/views/js/src/back/transaction/components/refund/RefundForm.tsx b/views/js/src/back/transaction/components/refund/RefundForm.tsx
@@ -46,14 +46,13 @@ import { useDispatch, useMappedState } from 'redux-react-hook';
 export default function RefundForm(): ReactElement<{}> {
   const [loading, setLoading] = useState<boolean>(false);
   const [refundInput, setRefundInput] = useState<string>('');
-  const { translations, payment: { id: transactionId }, payment, currencies, config: { legacy } }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, payment: { id: transactionId }, payment, currencies, config: { legacy } }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     config: state.config,
     payment: state.payment,
     currencies: state.currencies,
-  }),), []);
+  }),);
   const dispatch = useDispatch();
-  const _dispatchUpdatePayment = (payment: IMollieApiPayment) => useCallback(() => dispatch(updatePayment(payment)), []);
 
   async function _refundPayment(partial = false): Promise<boolean> {
     let amount;
@@ -94,7 +93,7 @@ export default function RefundForm(): ReactElement<{}> {
         const { success = false, payment = null } = await refundPaymentAjax(transactionId, amount);
         if (success) {
           if (payment) {
-            _dispatchUpdatePayment(payment);
+            dispatch(updatePayment(payment));
             setRefundInput('');
           }
         } else {

diff --git a/views/js/src/back/transaction/components/refund/RefundHistory.tsx b/views/js/src/back/transaction/components/refund/RefundHistory.tsx
@@ -37,10 +37,10 @@ import EmptyRefundTable from '@transaction/components/refund/EmptyRefundTable';
 import RefundTable from '@transaction/components/refund/RefundTable';
 
 export default function RefundHistory(): ReactElement<{}> {
-  const { translations, payment }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations, payment }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
     payment: state.payment,
-  })), []);
+  }));
 
   return (
     <>

diff --git a/views/js/src/back/transaction/components/refund/RefundInfo.tsx b/views/js/src/back/transaction/components/refund/RefundInfo.tsx
@@ -45,11 +45,11 @@ const Div = styled.div`
 ` as any;
 
 export default function RefundInfo(): ReactElement<{}> {
-  const { translations, config: { legacy }, payment }: Partial<IMollieOrderState> = useCallback(useMappedState( (state: IMollieOrderState): any => ({
+  const { translations, config: { legacy }, payment }: Partial<IMollieOrderState> = useMappedState( (state: IMollieOrderState): any => ({
     payment: state.payment,
     translations: state.translations,
     config: state.config,
-  })), []);
+  }));
 
   if (legacy) {
     return (

diff --git a/views/js/src/back/transaction/components/refund/RefundPanel.tsx b/views/js/src/back/transaction/components/refund/RefundPanel.tsx
@@ -38,10 +38,10 @@ import RefundInfo from '@transaction/components/refund/RefundInfo';
 import LoadingDots from '@shared/components/LoadingDots';
 
 export default function RefundPanel(): ReactElement<{}> {
-  const { payment, config }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { payment, config }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     config: state.config,
     payment: state.payment,
-  }),), []);
+  }),);
 
   if (Object.keys(config).length <= 0) {
     return null;

diff --git a/views/js/src/back/transaction/components/refund/RefundTable.tsx b/views/js/src/back/transaction/components/refund/RefundTable.tsx
@@ -40,10 +40,10 @@ import { formatCurrency } from '@shared/tools';
 import { IMollieApiRefund } from '@shared/globals';
 
 export default function RefundTable(): ReactElement<{}> {
-  const { payment, currencies }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { payment, currencies }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     payment: state.payment,
     currencies: state.currencies,
-  })), []);
+  }));
 
   return (
     <div className="table-responsive">

diff --git a/views/js/src/back/transaction/components/refund/RefundTableHeader.tsx b/views/js/src/back/transaction/components/refund/RefundTableHeader.tsx
@@ -34,9 +34,9 @@ import React, { ReactElement, useCallback } from 'react';
 import { useMappedState } from 'redux-react-hook';
 
 export default function RefundTableHeader(): ReactElement<{}> {
-  const { translations }: Partial<IMollieOrderState> = useCallback(useMappedState((state: IMollieOrderState): any => ({
+  const { translations }: Partial<IMollieOrderState> = useMappedState((state: IMollieOrderState): any => ({
     translations: state.translations,
-  })), []);
+  }));
 
   return (
     <thead>