Merge pull request #29 from buckaroo-it/develop

Develop

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://www.buckaroo.nl/media/3577/magento2_hyva_icon.png" width="200px" position="center">
+  <img src="https://github.com/buckaroo-it/Magento2_Hyva/assets/105488705/2bdf7c56-d2ce-44a8-a338-48e4e70b4996" width="200px" position="center">
 </p>
 
 # Buckaroo Magento2 Hyvä checkout extension
@@ -85,6 +85,13 @@ Currently not all payment methods are supported in our Magento 2 Hyvä checkout
 We really appreciate it when developers contribute to improve the Buckaroo plugins.
 If you want to contribute as well, then please follow our [Contribution Guidelines](CONTRIBUTING.md).
 
+> ### Community is the :green_heart: of open source
+> Developing beautiful products is not possible without the input of a community. We thank everyone who actively contributes to this.
+> 
+> [![ennostuurman's avatar](https://github.com/ennostuurman.png?size=50)](https://github.com/ennostuurman) [![rajeev-k-tomy's avatar](https://github.com/rajeev-k-tomy.png?size=50)](https://github.com/rajeev-k-tomy) [![poespas's avatar](https://github.com/poespas.png?size=50)](https://github.com/poespas) [![marissennet's avatar](https://github.com/marissennet.png?size=50)](https://github.com/marissennet) ![mgroensmit's avatar](https://avatars.githubusercontent.com/u/63691247?s=50)
+
+We would like to extend a special thank you to the developers at [Mooore](https://www.mooore.nl/) who have been co-developing with us on this project and were the initiators of this collaboration. Your hard work, dedication, and expertise have been invaluable in bringing this project to life. We couldn't have done it without you. Thank you! :raised_hands:
+
 ### Versioning 
 <p align="left">
   <img src="https://www.buckaroo.nl/media/3480/magento_versioning.png" width="500px" position="center">
@@ -98,3 +105,4 @@ If you want to contribute as well, then please follow our [Contribution Guidelin
 ### Additional information
 - **Support:** https://support.buckaroo.eu/contact
 - **Contact:** [[email protected]](mailto:[email protected]) or [+31 (0)30 711 50 50](tel:+310307115050)
+

src/method/Afterpay/helpers.js

@@ -91,13 +91,13 @@ export function prepareValidationSchema(cart) {
     tos: YupBool().oneOf([true], requiredMessage),
     identificationNumber: YupString().when('isCompany', {
       is: () => cart.billing_address.country === 'FI',
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
     coc: YupString().when('isb2b', {
       is: () => showCOC(cart),
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
   });
 }

src/method/AfterpayOld/helpers.js

@@ -138,8 +138,9 @@ export function prepareValidationSchema(cart, paymentMethod) {
   return YupObject({
     telephone: YupString().when('canShowPhone', {
       is: () => canShowPhone(cart),
-      then: YupString().required(requiredMessage).bkOnlyNumeric(onlyNumeric),
-      otherwise: YupString(),
+      then: () =>
+        YupString().required(requiredMessage).bkOnlyNumeric(onlyNumeric),
+      otherwise: () => YupString(),
     }),
     dob: YupString()
       .required(requiredMessage)
@@ -148,20 +149,22 @@ export function prepareValidationSchema(cart, paymentMethod) {
     businessType: YupString().oneOf(['b2b', 'b2c'], requiredMessage),
     coc: YupString().when('aaa', {
       is: () => isDigiAccept(paymentMethod),
-      then: YupString().required(requiredMessage).bkOnlyNumeric(onlyNumeric),
-      otherwise: YupString(),
+      then: () =>
+        YupString().required(requiredMessage).bkOnlyNumeric(onlyNumeric),
+      otherwise: () => YupString(),
     }),
     iban: YupString().when('businessType', {
       is: (fields) => isB2B(paymentMethod, fields),
-      then: YupString()
-        .required(requiredMessage)
-        .bkValidateBankNumber(__('Please enter a valid account number')),
-      otherwise: YupString(),
+      then: () =>
+        YupString()
+          .required(requiredMessage)
+          .bkValidateBankNumber(__('Please enter a valid account number')),
+      otherwise: () => YupString(),
     }),
     companyName: YupString().when('businessType', {
       is: (fields) => isB2B(paymentMethod, fields),
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
   });
 }

src/method/Bancontact/Bancontact.jsx

@@ -15,7 +15,13 @@ import usePlaceOrder from './usePlaceOrder';
 function Bancontact({ method, selected, actions }) {
   const isSelected = method.code === selected.code;
   const { registerPaymentAction } = useCheckoutFormContext();
-  const [clientSideMode, setClientSideMode] = useState('cc');
+
+  let defaultClientSideMode = 'mobile';
+  if (useClientSide) {
+    defaultClientSideMode = 'cc';
+  }
+
+  const [clientSideMode, setClientSideMode] = useState(defaultClientSideMode);
 
   const formik = useFormik({
     initialValues: {

src/method/Bancontact/helpers/index.js

@@ -8,4 +8,4 @@ export const yearStart = new Date().getFullYear();
 export const range = (size, startAt = 0) =>
   [...Array(size).keys()].map((i) => i + startAt);
 
-export const useClientSide = getConfig('mrcash.useClientSide');
+export const useClientSide = getConfig('mrcash.useClientSide') === 1;

src/method/Billink/helpers.js

@@ -13,23 +13,23 @@ export const validationSchema = (showDob) => {
     tos: YupBool().oneOf([true], requiredMessage),
     coc: YupString().when('showB2b', {
       is: () => showB2b,
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
     phone: YupString().when('showB2b', {
       is: () => !showB2b,
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
     gender: YupString().when('showDob', {
       is: () => showDob,
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
     dob: YupString().when('showDob', {
       is: () => showDob,
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
   });
 };

src/method/In3/helpers.js

@@ -67,12 +67,13 @@ export const validationSchema = (showPhone, country) =>
     dob: YupString().required(requiredMessage),
     phone: YupString().when('showPhone', {
       is: () => showPhone,
-      then: YupString()
-        .required(requiredMessage)
-        .bkValidatePhone({
-          errorMessage: __('Phone number should be correct.'),
-          country,
-        }),
-      otherwise: YupString(),
+      then: () =>
+        YupString()
+          .required(requiredMessage)
+          .bkValidatePhone({
+            errorMessage: __('Phone number should be correct.'),
+            country,
+          }),
+      otherwise: () => YupString(),
     }),
   });

src/method/SepaDirect/helpers.js

@@ -47,12 +47,13 @@ export const validationSchema = (isNotNL) => {
     bankAccountNumber: YupString()
       .required(requiredMessage)
       .bkValidateBankNumber(__('Please enter a valid account number')),
-    bic: YupString().when('isNotNL', {
+    bic: YupString().when([], {
       is: () => isNotNL,
-      then: YupString()
-        .required(requiredMessage)
-        .bkValidateBic(__('Please enter a valid bic number')),
-      otherwise: YupString(),
+      then: () =>
+        YupString()
+          .required(requiredMessage)
+          .bkValidateBic(__('Please enter a valid bic number')),
+      otherwise: () => YupString(),
     }),
   });
 };

src/method/Tinka/helpers.js

@@ -7,7 +7,7 @@ export const validationSchema = (showDob) =>
   YupObject({
     dob: YupString().when('showDob', {
       is: () => showDob,
-      then: YupString().required(requiredMessage),
-      otherwise: YupString(),
+      then: () => YupString().required(requiredMessage),
+      otherwise: () => YupString(),
     }),
   });