@licklist/design 0.70.0-dev.2 → 0.70.0-dev.4

package/dist/custom-fields/field-set/components/CustomFieldSet/CustomFieldSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CustomFieldSet.d.ts","sourceRoot":"","sources":["../../../../../src/custom-fields/field-set/components/CustomFieldSet/CustomFieldSet.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAG3E,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAA;AAKlC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAW9E,KAAK,mBAAmB,GAAG,iBAAiB,GAAG;IAC7C,YAAY,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAClD,IAAI,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAA;IACpC,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,gBAAgB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;IAC1D,gBAAgB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;IAC1D,YAAY,CAAC,EAAE,WAAW,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,cAAc,2HASxB,mBAAmB,4CAkMrB,CAAA"}
+{"version":3,"file":"CustomFieldSet.d.ts","sourceRoot":"","sources":["../../../../../src/custom-fields/field-set/components/CustomFieldSet/CustomFieldSet.tsx"],"names":[],"mappings":"AAeA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAA;AAEtF,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAA;AAI3E,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAA;AAKlC,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAW9E,KAAK,mBAAmB,GAAG,iBAAiB,GAAG;IAC7C,YAAY,EAAE,oBAAoB,CAAC,cAAc,CAAC,CAAA;IAClD,IAAI,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAA;IACpC,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,gBAAgB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;IAC1D,gBAAgB,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAA;IAC1D,YAAY,CAAC,EAAE,WAAW,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,cAAc,2HASxB,mBAAmB,4CAgNrB,CAAA"}

package/dist/custom-fields/field-set/components/CustomFieldSet/CustomFieldSet.js

@@ -7,6 +7,7 @@ import { isEqual } from 'lodash';
 import { CUSTOM_FIELD_TYPE_INPUT, CUSTOM_FIELD_TYPE_DROPDOWN } from '@licklist/core/dist/DataMapper/Order/CustomFieldDataMapper';
 import FormErrorService from '@licklist/plugins/dist/services/Form/FormErrorService';
 import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService';
+import useNotification from '@licklist/plugins/dist/context/app/hooks/useNotification';
 import { CreateSortableListItem } from '../../../../sortable-list/CreateSortableListItem.js';
 import { SORTABLE_ID_KEY } from '../../../../sortable-list/SortableList.js';
 import { SortableTreeItem } from '../../../../sortable-tree/SortableTreeItem.js';
@@ -270,6 +271,7 @@ var CustomFieldSet = function(param) {
         serverErrors,
         setError
     ]);
+    var notification = useNotification();
     var _useFieldArray = useFieldArray({
         control: control,
         name: CUSTOM_FIELDS
@@ -293,6 +295,12 @@ var CustomFieldSet = function(param) {
                         if (!response) return [
                             2
                         ];
+                        notification.success({
+                            title: t('App:success'),
+                            message: t('Notification:createSuccessfully', {
+                                argument: t('customField')
+                            })
+                        });
                         setFieldSets(function(prevFieldSets) {
                             var nextFieldSets = _to_consumable_array(prevFieldSets);
                             var nextFieldSetFormProps = _object_spread({}, formValues, response);
@@ -325,6 +333,12 @@ var CustomFieldSet = function(param) {
                         ];
                     case 1:
                         _state.sent();
+                        notification.success({
+                            title: t('App:success'),
+                            message: t('Notification:theRemovedSuccessfully', {
+                                argument: t('customField')
+                            })
+                        });
                         _state.label = 2;
                     case 2:
                         setFieldSets(sortedItems.filter(function(sortedItem) {

package/dist/iframe/ryft/RyftPaymentForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RyftPaymentForm.d.ts","sourceRoot":"","sources":["../../../src/iframe/ryft/RyftPaymentForm.tsx"],"names":[],"mappings":"AAOA,OAAO,EAKL,sBAAsB,EACvB,MAAM,kDAAkD,CAAA;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0EAA0E,CAAA;AAKlH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAW/C,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AAEzD,MAAM,WAAW,oBAAoB;IAEnC,SAAS,EAAE,GAAG,CAAA;IACd,eAAe,EAAE,OAAO,CAAA;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAA;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,EAAE,CACR,SAAS,EAAE,MAAM,IAAI,EACrB,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,KAChC,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,QAAQ,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAA;IAC/C,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;CAClD;AAED,eAAO,MAAM,eAAe,8JAUzB,oBAAoB,4CA8KtB,CAAA"}
+{"version":3,"file":"RyftPaymentForm.d.ts","sourceRoot":"","sources":["../../../src/iframe/ryft/RyftPaymentForm.tsx"],"names":[],"mappings":"AAOA,OAAO,EAML,sBAAsB,EACvB,MAAM,kDAAkD,CAAA;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0EAA0E,CAAA;AAKlH,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAW/C,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AAEzD,MAAM,WAAW,oBAAoB;IAEnC,SAAS,EAAE,GAAG,CAAA;IACd,eAAe,EAAE,OAAO,CAAA;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,qBAAqB,CAAC,EAAE,MAAM,IAAI,CAAA;IAClC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,EAAE,CACR,SAAS,EAAE,MAAM,IAAI,EACrB,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,KAChC,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,QAAQ,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAA;IAC/C,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;CAClD;AAED,eAAO,MAAM,eAAe,8JAUzB,oBAAoB,4CA+KtB,CAAA"}

package/dist/iframe/ryft/RyftPaymentForm.js

@@ -5,7 +5,7 @@ import { useForm } from 'react-hook-form';
 import Button from 'react-bootstrap/Button';
 import { useHistory } from 'react-router-dom';
 import Alert from 'react-bootstrap/Alert';
-import { useRyftPayment, RYFT_STATUS_PENDING_ACTION, RYFT_STATUS_APPROVED, RYFT_STATUS_CAPTURED } from '@licklist/plugins/dist/hooks/Ryft/useRyftPayment';
+import { useRyftPayment, RYFT_STATUS_PENDING_ACTION, RYFT_STATUS_APPROVED, RYFT_STATUS_CAPTURED, RYFT_STATUS_PENDING_PAYMENT } from '@licklist/plugins/dist/hooks/Ryft/useRyftPayment';
 import '../../static/index.js';
 import { injectComponentsInRyftForm } from './utils/ryft-form.js';
 import { ButtonLoader } from '../../static/loader/ButtonLoader.js';
@@ -220,7 +220,7 @@ var RyftPaymentForm = function(param) {
         if (!(paymentSession === null || paymentSession === void 0 ? void 0 : paymentSession.id) || !(paymentSession === null || paymentSession === void 0 ? void 0 : paymentSession.returnUrl)) return;
         // Handle there cases when orderStatus - Captured, Approved,
         // or when no redirect URL and orderStatus - PendingAction
-        window.location.href = "".concat(paymentSession.returnUrl, "&ps=").concat(paymentSession.id);
+        window.location.href = "".concat(paymentSession.returnUrl, "&paymentSessionId=").concat(paymentSession.id);
         setReferrerBeforePayment();
     };
     var handleSubmit = function() {
@@ -257,7 +257,7 @@ var RyftPaymentForm = function(param) {
                             window.location.href = paymentSession.requiredAction.url;
                             setReferrerBeforePayment();
                         }
-                        if (paymentSession.status === RYFT_STATUS_APPROVED || paymentSession.status === RYFT_STATUS_CAPTURED) {
+                        if (paymentSession.status === RYFT_STATUS_APPROVED || paymentSession.status === RYFT_STATUS_CAPTURED || paymentSession.status === RYFT_STATUS_PENDING_PAYMENT) {
                             redirectOnFailAttempt(paymentSession);
                             return [
                                 2

package/dist/iframe/ryft/utils/ryft-form.js

@@ -49,11 +49,11 @@ var injectComponentsInRyftForm = function(param) {
         var appleButton = document.getElementById('ryft-pay-apple-pay-button');
         if (googleButton) {
             googleButton.disabled = isDisableButton;
-            googleButton.style.opacity = isDisableButton ? '1' : '0.6';
+            googleButton.style.opacity = !isDisableButton ? '1' : '0.6';
         }
         if (appleButton) {
             appleButton.disabled = isDisableButton;
-            appleButton.style.opacity = isDisableButton ? '1' : '0.6';
+            appleButton.style.opacity = !isDisableButton ? '1' : '0.6';
         }
     }
     if (isAppUsingInIframe) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.70.0-dev.2",
+  "version": "0.70.0-dev.4",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -44,7 +44,7 @@
   "peerDependencies": {
     "@licklist/core": "0.31.0-dev.0",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.34.0-dev.2",
+    "@licklist/plugins": "0.34.0-dev.4",
     "lodash": "4.17.21",
     "luxon": "3.5.0",
     "react": "17.0.2",
@@ -63,7 +63,7 @@
     "@fortawesome/free-solid-svg-icons": "5.15.2",
     "@licklist/core": "0.31.0-dev.0",
     "@licklist/eslint-config": "0.5.6",
-    "@licklist/plugins": "0.34.0-dev.2",
+    "@licklist/plugins": "0.34.0-dev.4",
     "@mantine/core": "6.0.22",
     "@mantine/hooks": "6.0.22",
     "@mdx-js/react": "1.6.22",
@@ -208,4 +208,4 @@
     "yarn": "4.4.0"
   },
   "stableVersion": "0.69.1-dev.3"
-}
+}

package/src/custom-fields/field-set/components/CustomFieldSet/CustomFieldSet.tsx

@@ -17,6 +17,7 @@ import { HasPermissionProp } from '@licklist/plugins/dist/types/permission/Permi
 import FormErrorService from '@licklist/plugins/dist/services/Form/FormErrorService'
 import { ServerError } from '@licklist/plugins/dist/hooks/Api/useHttpQuery'
 import HookFormService from '@licklist/plugins/dist/services/Form/HookFormService'
+import useNotification from '@licklist/plugins/dist/context/app/hooks/useNotification'
 
 import {
   CreateSortableListItem,
@@ -84,7 +85,7 @@ export const CustomFieldSet = ({
   useEffect(() => {
     FormErrorService.handleServerErrors(serverErrors, setError)
   }, [serverErrors, setError])
-
+  const notification = useNotification()
   const { fields, append, remove } = useFieldArray({
     control,
     name: CUSTOM_FIELDS,
@@ -97,6 +98,13 @@ export const CustomFieldSet = ({
 
     if (!response) return
 
+    notification.success({
+      title: t('App:success'),
+      message: t('Notification:createSuccessfully', {
+        argument: t('customField'),
+      }),
+    })
+
     setFieldSets((prevFieldSets) => {
       const nextFieldSets = [...prevFieldSets]
 
@@ -115,6 +123,13 @@ export const CustomFieldSet = ({
   const removeFieldSet = async () => {
     if (fieldSet.id !== null) {
       await onFieldSetDelete(fieldSet)
+
+      notification.success({
+        title: t('App:success'),
+        message: t('Notification:theRemovedSuccessfully', {
+          argument: t('customField'),
+        }),
+      })
     }
 
     setFieldSets(

package/src/iframe/ryft/RyftPaymentForm.tsx

@@ -10,6 +10,7 @@ import {
   RYFT_STATUS_APPROVED,
   RYFT_STATUS_CAPTURED,
   RYFT_STATUS_PENDING_ACTION,
+  RYFT_STATUS_PENDING_PAYMENT,
   AttemptPaymentResponse,
 } from '@licklist/plugins/dist/hooks/Ryft/useRyftPayment'
 import { ProviderPaymentSettings } from '@licklist/core/dist/DataMapper/Setting/ProviderPaymentSettingsDataMapper'
@@ -84,7 +85,7 @@ export const RyftPaymentForm = ({
 
     // Handle there cases when orderStatus - Captured, Approved,
     // or when no redirect URL and orderStatus - PendingAction
-    window.location.href = `${paymentSession.returnUrl}&ps=${paymentSession.id}`
+    window.location.href = `${paymentSession.returnUrl}&paymentSessionId=${paymentSession.id}`
     setReferrerBeforePayment()
   }
 
@@ -112,7 +113,8 @@ export const RyftPaymentForm = ({
 
       if (
         paymentSession.status === RYFT_STATUS_APPROVED ||
-        paymentSession.status === RYFT_STATUS_CAPTURED
+        paymentSession.status === RYFT_STATUS_CAPTURED ||
+        paymentSession.status === RYFT_STATUS_PENDING_PAYMENT
       ) {
         redirectOnFailAttempt(paymentSession)
         return

package/src/iframe/ryft/utils/ryft-form.ts

@@ -76,11 +76,11 @@ export const injectComponentsInRyftForm = ({
     ) as HTMLButtonElement
     if (googleButton) {
       googleButton.disabled = isDisableButton
-      googleButton.style.opacity = isDisableButton ? '1' : '0.6'
+      googleButton.style.opacity = !isDisableButton ? '1' : '0.6'
     }
     if (appleButton) {
       appleButton.disabled = isDisableButton
-      appleButton.style.opacity = isDisableButton ? '1' : '0.6'
+      appleButton.style.opacity = !isDisableButton ? '1' : '0.6'
     }
   }