@licklist/design 0.44.459 → 0.44.461

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,6 +7,7 @@ export interface RyftPaymentFormProps {
7
7
  isCreateLoading: boolean;
8
8
  initRyft: (onSuccess: () => void, onFailure: (error?: string) => void) => Promise<void>;
9
9
  onSubmit: () => Promise<AttemptPaymentResponse>;
10
+ resetReferrer?: () => void;
10
11
  }
11
- export declare const RyftPaymentForm: ({ accountId, isCreateLoading, initRyft, onSubmit, }: RyftPaymentFormProps) => JSX.Element;
12
+ export declare const RyftPaymentForm: ({ accountId, isCreateLoading, initRyft, resetReferrer, onSubmit, }: RyftPaymentFormProps) => JSX.Element;
12
13
  //# sourceMappingURL=RyftPaymentForm.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"RyftPaymentForm.d.ts","sourceRoot":"","sources":["../../../src/iframe/ryft/RyftPaymentForm.tsx"],"names":[],"mappings":";AAQA,OAAO,EAKL,sBAAsB,EACvB,MAAM,kDAAkD,CAAC;AAG1D,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAW/C,CAAC;AAEF,oBAAY,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAE1D,MAAM,WAAW,oBAAoB;IAEnC,SAAS,EAAE,GAAG,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,CACR,SAAS,EAAE,MAAM,IAAI,EACrB,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,KAChC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC;CACjD;AAED,eAAO,MAAM,eAAe,wDAKzB,oBAAoB,gBA0ItB,CAAC"}
1
+ {"version":3,"file":"RyftPaymentForm.d.ts","sourceRoot":"","sources":["../../../src/iframe/ryft/RyftPaymentForm.tsx"],"names":[],"mappings":";AAQA,OAAO,EAKL,sBAAsB,EACvB,MAAM,kDAAkD,CAAC;AAG1D,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAW/C,CAAC;AAEF,oBAAY,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAE1D,MAAM,WAAW,oBAAoB;IAEnC,SAAS,EAAE,GAAG,CAAC;IACf,eAAe,EAAE,OAAO,CAAC;IACzB,QAAQ,EAAE,CACR,SAAS,EAAE,MAAM,IAAI,EACrB,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,KAChC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,QAAQ,EAAE,MAAM,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;CAC5B;AAED,eAAO,MAAM,eAAe,uEAMzB,oBAAoB,gBAmJtB,CAAC"}
@@ -1 +1 @@
1
- "use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),a=e(r),n=require("react-router-dom"),i=require("../../static/loader/BlockLoader.js"),o=require("react-i18next"),u=e(require("react-bootstrap/Button")),s=require("react-hook-form"),c=e(require("react-bootstrap/Form")),l=require("../../static/loader/ButtonLoader.js"),d=e(require("react-bootstrap/Alert"));require("../../static/index.js");var m=require("@licklist/plugins/dist/hooks/Ryft/useRyftPayment"),f={insufficient_funds:"insufficientFunds",declined_do_not_honour:"declinedDoNotHonour",invalid_card_number:"invalidCardNumber",restricted_card:"restrictedCard",security_violation:"securityViolation",expired_card:"expiredCard",gateway_reject:"gatewayReject",bad_track_data:"badTrackData","3ds_authentication_failure":"3dsAuthenticationFailure",unknown_error:"unknownError"};exports.RyftPaymentForm=function(e){var y=e.accountId,_=e.isCreateLoading,E=e.initRyft,v=e.onSubmit,p=o.useTranslation(["Design","Validation","Ryft"]).t,b=n.useHistory(),g=t.__read(r.useState(!1),2),R=g[0],h=g[1],q=t.__read(r.useState(!1),2),k=q[0],w=q[1],S=t.__read(r.useState(!1),2),T=S[0],F=S[1],N=t.__read(r.useState(void 0),2),A=N[0],P=N[1],x=m.useRyftPayment().addEventHandler,D=s.useForm(),C=function(e){(null==e?void 0:e.id)&&(null==e?void 0:e.returnUrl)&&(window.location.href="".concat(e.returnUrl,"&ps=").concat(e.id))};return r.useEffect((function(){y.data&&!y.isError&&E((function(){x("cardValidationChanged",(function(e){h(e.isValid)})),F(!1)}),(function(){return F(!0)}))}),[y.data]),y.isLoading||y.isFetching||_?a.createElement("div",{className:"mt-5 pt-5"},a.createElement(i.BlockLoader,null)):y.isError?a.createElement("div",{className:"mt-5 ryft-init-failure"},a.createElement(d,{key:"danger",variant:"danger"},a.createElement("h5",null,p("Ryft:errorMessage")),p("Ryft:noPaymentProviderFound"))):T?a.createElement("div",{className:"mt-5 ryft-init-failure"},a.createElement(d,{key:"danger",variant:"danger"},a.createElement("h5",null,p("Ryft:errorMessage")),p("Ryft:initFailureMessage"),a.createElement("div",{className:"flex flex-column align-items-center mt-4"},a.createElement(u,{variant:"primary",onClick:function(){b.go(0)}},p("Ryft:refresh"))))):a.createElement(a.Fragment,null,a.createElement(c.Label,null,p("Design:paymentDetails")),a.createElement("form",{id:"ryft-pay-form",noValidate:!0,onSubmit:D.handleSubmit((function(){return t.__awaiter(void 0,void 0,void 0,(function(){var e,r,a;return t.__generator(this,(function(t){switch(t.label){case 0:w(!0),t.label=1;case 1:return t.trys.push([1,3,4,5]),[4,v()];case 2:if((e=t.sent())||P("unknown_error"),"requiredAction"in e){if(e.status!==m.RYFT_STATUS_PENDING_ACTION||!(null===(a=e.requiredAction)||void 0===a?void 0:a.url))return C(e),[2];window.location.href=e.requiredAction.url}return e.status===m.RYFT_STATUS_APPROVED||e.status===m.RYFT_STATUS_CAPTURED?(C(e),[2]):(e.lastError&&P(e.lastError),[3,5]);case 3:return r=t.sent(),P(r),[3,5];case 4:return w(!1),[7];case 5:return[2]}}))}))})),className:"ryft-payment-form"},a.createElement("div",{className:"submit-button-wrapper mt-3"},a.createElement(u,{type:"submit",disabled:k||!R},k&&a.createElement(l.ButtonLoader,null),p("Design:buyNow"))),A&&a.createElement("div",{id:"ryft-payment-error"},p("".concat(f[A])))))},exports.ryftErrorMap=f;
1
+ "use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),r=require("react"),a=e(r),n=require("react-router-dom"),i=require("../../static/loader/BlockLoader.js"),o=require("react-i18next"),u=e(require("react-bootstrap/Button")),s=require("react-hook-form"),c=e(require("react-bootstrap/Form")),l=require("../../static/loader/ButtonLoader.js"),d=e(require("react-bootstrap/Alert"));require("../../static/index.js");var f=require("@licklist/plugins/dist/hooks/Ryft/useRyftPayment"),m={insufficient_funds:"insufficientFunds",declined_do_not_honour:"declinedDoNotHonour",invalid_card_number:"invalidCardNumber",restricted_card:"restrictedCard",security_violation:"securityViolation",expired_card:"expiredCard",gateway_reject:"gatewayReject",bad_track_data:"badTrackData","3ds_authentication_failure":"3dsAuthenticationFailure",unknown_error:"unknownError"};exports.RyftPaymentForm=function(e){var y=e.accountId,_=e.isCreateLoading,E=e.initRyft,v=e.resetReferrer,p=e.onSubmit,b=o.useTranslation(["Design","Validation","Ryft"]).t,g=n.useHistory(),R=t.__read(r.useState(!1),2),h=R[0],q=R[1],k=t.__read(r.useState(!1),2),w=k[0],S=k[1],T=t.__read(r.useState(!1),2),F=T[0],N=T[1],A=t.__read(r.useState(void 0),2),P=A[0],x=A[1],D=f.useRyftPayment().addEventHandler,C=s.useForm(),j=function(){v&&v()},L=function(e){(null==e?void 0:e.id)&&(null==e?void 0:e.returnUrl)&&(window.location.href="".concat(e.returnUrl,"&ps=").concat(e.id),j())};return r.useEffect((function(){y.data&&!y.isError&&E((function(){D("cardValidationChanged",(function(e){q(e.isValid)})),N(!1)}),(function(){return N(!0)}))}),[y.data]),y.isLoading||y.isFetching||_?a.createElement("div",{className:"mt-5 pt-5"},a.createElement(i.BlockLoader,null)):y.isError?a.createElement("div",{className:"mt-5 ryft-init-failure"},a.createElement(d,{key:"danger",variant:"danger"},a.createElement("h5",null,b("Ryft:errorMessage")),b("Ryft:noPaymentProviderFound"))):F?a.createElement("div",{className:"mt-5 ryft-init-failure"},a.createElement(d,{key:"danger",variant:"danger"},a.createElement("h5",null,b("Ryft:errorMessage")),b("Ryft:initFailureMessage"),a.createElement("div",{className:"flex flex-column align-items-center mt-4"},a.createElement(u,{variant:"primary",onClick:function(){g.go(0)}},b("Ryft:refresh"))))):a.createElement(a.Fragment,null,a.createElement(c.Label,null,b("Design:paymentDetails")),a.createElement("form",{id:"ryft-pay-form",noValidate:!0,onSubmit:C.handleSubmit((function(){return t.__awaiter(void 0,void 0,void 0,(function(){var e,r,a;return t.__generator(this,(function(t){switch(t.label){case 0:S(!0),t.label=1;case 1:return t.trys.push([1,3,4,5]),[4,p()];case 2:if((e=t.sent())||x("unknown_error"),"requiredAction"in e){if(e.status!==f.RYFT_STATUS_PENDING_ACTION||!(null===(a=e.requiredAction)||void 0===a?void 0:a.url))return L(e),[2];window.location.href=e.requiredAction.url,j()}return e.status===f.RYFT_STATUS_APPROVED||e.status===f.RYFT_STATUS_CAPTURED?(L(e),[2]):(e.lastError&&(x(e.lastError),j()),[3,5]);case 3:return r=t.sent(),x(r),[3,5];case 4:return S(!1),[7];case 5:return[2]}}))}))})),className:"ryft-payment-form"},a.createElement("div",{className:"submit-button-wrapper mt-3"},a.createElement(u,{type:"submit",disabled:w||!h},w&&a.createElement(l.ButtonLoader,null),b("Design:buyNow"))),P&&a.createElement("div",{id:"ryft-payment-error"},b("".concat(m[P])))))},exports.ryftErrorMap=m;
@@ -1 +1 @@
1
- "use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("react"));require("../../../static/loader/LoaderIndicator.js");var a=require("../../../static/loader/BlockLoader.js"),r=require("react-i18next"),l=require("react-bootstrap");require("../../../static/loader/ButtonLoader.js"),require("../../../static/loader/SnippetLoader.js"),require("../../../static/loader/PaymentLoader.js");var n=require("luxon"),o=require("rrule"),i=(e(o),e(require("@licklist/plugins/dist/services/Media/MediaService"))),s=require("../formatDays.js"),d=function(e){var a,i,d,c=e.coverImageUrl,u=e.title,m=e.rrule,v=e.startAt,E=e.endAt,p=e.isSoldOut,g=e.onClick,f=r.useTranslation("Sale").t;return t.createElement("div",{role:"button",tabIndex:0,className:"event-card-manual-booking","aria-disabled":p,onClick:p?void 0:g,onKeyUp:p?void 0:g},t.createElement("div",{className:"card-image-container"},t.createElement(l.Card.Img,{variant:"top",src:c,className:["card-img-manual-booking",p?"disable-img":""].join(" ")}),p&&t.createElement("div",{className:"sold-out"},f("soldOut"))),t.createElement("div",{className:"event-card-title"},u),t.createElement("div",{className:"event-card-days"},m?s.formatToDays(null===(i=null===(a=o.rrulestr(m.includes("EXDATE")?m.split(";EXDATE=")[0]:m))||void 0===a?void 0:a.options)||void 0===i?void 0:i.byweekday):s.formatToDays([null===(d=n.DateTime.fromISO(v))||void 0===d?void 0:d.day])),t.createElement("div",{className:"event-card-hours"},s.formatToHours(v,E)))};exports.EventCardManualBooking=d,exports.SelectEvent=function(e){var n=e.events,o=e.isLoading,s=e.selectEvent,c=r.useTranslation(["App","Sale"]).t;return t.createElement("div",null,o?t.createElement("div",{className:"loader-container"},t.createElement(a.BlockLoader,null)):t.createElement(t.Fragment,null,n&&n.length||o?t.createElement(t.Fragment,null,!o&&t.createElement(l.Form.Label,{className:"bold-text"},c("App:events")),t.createElement("div",{className:"event-list-manual-booking"},null==n?void 0:n.map((function(e){var a;return t.createElement(d,{key:"".concat(e.id,"-").concat(e.createdAt),coverImageUrl:i.getImageSrcByEvent(e),title:null==e?void 0:e.name,rrule:null==e?void 0:e.rrule,startAt:null==e?void 0:e.startAt,endAt:null==e?void 0:e.endAt,isSoldOut:null===(a=null==e?void 0:e.menusInfo)||void 0===a?void 0:a.isAllMenuProductsSoldOut,onClick:function(){return s(e)}})})))):t.createElement("div",{className:"no-results-content"},t.createElement("span",{className:"no-results-found"},c("App:noResultsFound")))))};
1
+ "use strict";function e(e){return e&&"object"==typeof e&&"default"in e?e.default:e}Object.defineProperty(exports,"__esModule",{value:!0});var t=e(require("react"));require("../../../static/loader/LoaderIndicator.js");var a=require("../../../static/loader/BlockLoader.js"),r=require("react-i18next"),l=require("react-bootstrap");require("../../../static/loader/ButtonLoader.js"),require("../../../static/loader/SnippetLoader.js"),require("../../../static/loader/PaymentLoader.js");var n=require("luxon"),o=require("rrule"),i=(e(o),e(require("@licklist/plugins/dist/services/Media/MediaService"))),s=require("../formatDays.js"),d=function(e){var a,i,d,c=e.coverImageUrl,u=e.title,m=e.rrule,v=e.startAt,E=e.endAt,p=e.isSoldOut,g=e.onClick,f=r.useTranslation("Sale").t;return t.createElement("div",{role:"button",tabIndex:0,className:"event-card-manual-booking","aria-disabled":p,onClick:p?void 0:g,onKeyUp:p?void 0:g},t.createElement("div",{className:"card-image-container"},t.createElement(l.Card.Img,{variant:"top",src:c,className:["card-img-manual-booking",p?"disable-img":""].join(" ")}),p&&t.createElement("div",{className:"sold-out"},f("soldOut"))),t.createElement("div",{className:"event-card-title"},u),t.createElement("div",{className:"event-card-days"},m?s.formatToDays(null===(i=null===(a=o.rrulestr(m.includes("EXDATE")?m.split(";EXDATE=")[0]:m))||void 0===a?void 0:a.options)||void 0===i?void 0:i.byweekday):s.formatToDays([null===(d=n.DateTime.fromISO(v))||void 0===d?void 0:d.day])),t.createElement("div",{className:"event-card-hours"},s.formatToHours(v,E)))};exports.EventCardManualBooking=d,exports.SelectEvent=function(e){var n=e.events,o=e.isLoading,s=e.selectEvent,c=r.useTranslation(["App","Sale"]).t;return t.createElement("div",null,o?t.createElement("div",{className:"loader-container"},t.createElement(a.BlockLoader,null)):t.createElement(t.Fragment,null,n&&n.length||o?t.createElement(t.Fragment,null,!o&&t.createElement(l.Form.Label,{className:"bold-text"},c("App:events")),t.createElement("div",{className:"event-list-manual-booking"},null==n?void 0:n.map((function(e){var a;return t.createElement(d,{key:"".concat(e.id,"-").concat(e.createdAt),coverImageUrl:i.getImageSrcByEvent(e),title:null==e?void 0:e.name,rrule:null==e?void 0:e.rrule,startAt:null==e?void 0:e.startAt,endAt:null==e?void 0:e.endAt,isSoldOut:null===(a=null==e?void 0:e.menusInfo)||void 0===a?void 0:a.isAllMenuProductsSoldOut,onClick:function(){return s(e)}})})))):t.createElement("div",{className:"no-results-content"},t.createElement("span",{className:"no-results-found"},c("App:noResultsFoundForSelectedDate")))))};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@licklist/design",
3
- "version": "0.44.459",
3
+ "version": "0.44.461",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
@@ -39,12 +39,14 @@ export interface RyftPaymentFormProps {
39
39
  onFailure: (error?: string) => void
40
40
  ) => Promise<void>;
41
41
  onSubmit: () => Promise<AttemptPaymentResponse>;
42
+ resetReferrer?: () => void;
42
43
  }
43
44
 
44
45
  export const RyftPaymentForm = ({
45
46
  accountId,
46
47
  isCreateLoading,
47
48
  initRyft,
49
+ resetReferrer,
48
50
  onSubmit,
49
51
  }: RyftPaymentFormProps) => {
50
52
  const { t } = useTranslation(["Design", "Validation", "Ryft"]);
@@ -58,12 +60,19 @@ export const RyftPaymentForm = ({
58
60
  const { addEventHandler } = useRyftPayment();
59
61
  const methods = useForm<RyftPaymentFormValues>();
60
62
 
63
+ const setReferrerBeforePayment = () => {
64
+ if (!resetReferrer) return;
65
+
66
+ resetReferrer();
67
+ };
68
+
61
69
  const redirectOnFailAttempt = (paymentSession: AttemptPaymentResponse) => {
62
70
  if (!paymentSession?.id || !paymentSession?.returnUrl) return;
63
71
 
64
72
  // Handle there cases when orderStatus - Captured, Approved,
65
73
  // or when no redirect URL and orderStatus - PendingAction
66
74
  window.location.href = `${paymentSession.returnUrl}&ps=${paymentSession.id}`;
75
+ setReferrerBeforePayment();
67
76
  };
68
77
 
69
78
  const handleSubmit = async () => {
@@ -86,6 +95,7 @@ export const RyftPaymentForm = ({
86
95
  }
87
96
 
88
97
  window.location.href = paymentSession.requiredAction.url;
98
+ setReferrerBeforePayment();
89
99
  }
90
100
 
91
101
  if (
@@ -98,6 +108,7 @@ export const RyftPaymentForm = ({
98
108
 
99
109
  if (paymentSession.lastError) {
100
110
  setRyftError(paymentSession.lastError);
111
+ setReferrerBeforePayment();
101
112
  }
102
113
  } catch (error) {
103
114
  setRyftError(error as string);
@@ -32,7 +32,7 @@ export const SelectEvent = ({
32
32
  {(!events || !events.length) && !isLoading ? (
33
33
  <div className="no-results-content">
34
34
  <span className="no-results-found">
35
- {t("App:noResultsFound")}
35
+ {t("App:noResultsFoundForSelectedDate")}
36
36
  </span>
37
37
  </div>
38
38
  ) : (