@pisell/private-materials 6.3.26 → 6.3.27

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.
Files changed (349) hide show
  1. package/build/lowcode/assets-daily.json +11 -11
  2. package/build/lowcode/assets-dev.json +2 -2
  3. package/build/lowcode/assets-prod.json +11 -11
  4. package/build/lowcode/index.js +1 -1
  5. package/build/lowcode/meta.js +1 -1
  6. package/build/lowcode/preview.js +146 -146
  7. package/build/lowcode/render/default/view.css +1 -1
  8. package/build/lowcode/render/default/view.js +7 -7
  9. package/build/lowcode/view.css +1 -1
  10. package/build/lowcode/view.js +8 -8
  11. package/es/components/Sales/Summary/utils.d.ts +1 -1
  12. package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
  13. package/es/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
  14. package/es/components/appointmentBooking/components/Cart/index.d.ts +1 -0
  15. package/es/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
  16. package/es/components/appointmentBooking/components/Footer/index.d.ts +1 -0
  17. package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
  18. package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
  19. package/es/components/booking/addons/model.d.ts +10 -1
  20. package/es/components/booking/components/TabProduct/index.d.ts +1 -0
  21. package/es/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
  22. package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts +1 -0
  23. package/es/components/booking/components/collapsibleList/utils.d.ts +1 -0
  24. package/es/components/booking/components/emptyBooking/index.d.ts +1 -0
  25. package/es/components/booking/components/footer/FooterMenus/index.d.ts +1 -0
  26. package/es/components/booking/components/formItemChildrenWrap/index.d.ts +1 -0
  27. package/es/components/booking/components/reloadResourceModal/index.d.ts +1 -0
  28. package/es/components/booking/forms/model.d.ts +10 -1
  29. package/es/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
  30. package/es/components/booking/forms/single/index.d.ts +1 -0
  31. package/es/components/booking/forms/table/index.d.ts +1 -0
  32. package/es/components/booking/hooks/useClearCart.d.ts +1 -0
  33. package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
  34. package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +1 -0
  35. package/es/components/booking/info/date/index.d.ts +1 -0
  36. package/es/components/booking/info/dateRange/index.d.ts +1 -0
  37. package/es/components/booking/info/model.d.ts +10 -1
  38. package/es/components/booking/info/notes/index.d.ts +1 -0
  39. package/es/components/booking/info/service/actions/index.d.ts +1 -0
  40. package/es/components/booking/info/service/addService/utils.d.ts +1 -1
  41. package/es/components/booking/info/service/like/index.d.ts +1 -0
  42. package/es/components/booking/info2/service/actions/index.d.ts +1 -0
  43. package/es/components/booking/info2/service/addService/utils.d.ts +1 -1
  44. package/es/components/booking/materiels/contacts/index.d.ts +1 -0
  45. package/es/components/booking/materiels/duration/index.d.ts +1 -0
  46. package/es/components/booking/materiels/holder/index.d.ts +1 -0
  47. package/es/components/booking/materiels/startTime/index.d.ts +1 -0
  48. package/es/components/booking/model.d.ts +9 -1
  49. package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts +1 -0
  50. package/es/components/booking/notes/NoteBlock/index.d.ts +1 -0
  51. package/es/components/booking/notes/model.d.ts +10 -1
  52. package/es/components/booking/payments/model.d.ts +10 -1
  53. package/es/components/eftpos/deviceList/index.d.ts +1 -0
  54. package/es/components/eftpos/form/index.d.ts +1 -0
  55. package/es/components/eftpos/group/index.d.ts +1 -0
  56. package/es/components/eftpos/hooks.d.ts +1 -0
  57. package/es/components/eftpos/icon/apiKey.d.ts +1 -0
  58. package/es/components/eftpos/icon/device.d.ts +1 -0
  59. package/es/components/eftpos/index.d.ts +1 -0
  60. package/es/components/eftpos/pos.d.ts +1 -0
  61. package/es/components/eftpos/receipt/index.d.ts +1 -0
  62. package/es/components/eftposPay/amount.d.ts +1 -0
  63. package/es/components/eftposPay/app.d.ts +1 -1
  64. package/es/components/eftposPay/component/alert/warn.d.ts +1 -0
  65. package/es/components/eftposPay/component/fail/failCustom.d.ts +1 -0
  66. package/es/components/eftposPay/component/fail/index.d.ts +1 -0
  67. package/es/components/eftposPay/component/fail/network.d.ts +1 -0
  68. package/es/components/eftposPay/component/fail/unknow.d.ts +1 -0
  69. package/es/components/eftposPay/component/header/titlebar.d.ts +1 -0
  70. package/es/components/eftposPay/component/manual/index.d.ts +1 -0
  71. package/es/components/eftposPay/component/signature/index.d.ts +1 -0
  72. package/es/components/eftposPay/component/step/index.d.ts +1 -0
  73. package/es/components/eftposPay/component/step/step.d.ts +1 -0
  74. package/es/components/eftposPay/hooks.d.ts +1 -1
  75. package/es/components/eftposPay/pay.d.ts +1 -0
  76. package/es/components/eftposPay/payo/config.d.ts +1 -0
  77. package/es/components/eftposPay/store/index.d.ts +1 -1
  78. package/es/components/eftposPay/tip.d.ts +1 -0
  79. package/es/components/eftposPay/tyro/hooks.d.ts +1 -0
  80. package/es/components/eftposPay/windcave/receiptAction.d.ts +1 -0
  81. package/es/components/eftposPay/windcave/windcave.d.ts +1 -0
  82. package/es/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
  83. package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +1 -0
  84. package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
  85. package/es/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
  86. package/es/components/eventBooking/components/Provider/Content/index.d.ts +1 -0
  87. package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
  88. package/es/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
  89. package/es/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
  90. package/es/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
  91. package/es/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
  92. package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
  93. package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
  94. package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
  95. package/es/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
  96. package/es/components/eventBooking/components/Provider/SelectHolderModal.d.ts +1 -0
  97. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +1 -0
  98. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
  99. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
  100. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +1 -0
  101. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +1 -0
  102. package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +1 -0
  103. package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
  104. package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts +1 -0
  105. package/es/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts +1 -0
  106. package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +1 -0
  107. package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
  108. package/es/components/login/index.d.ts +1 -0
  109. package/es/components/pay/toC/PaymentMethods/ApplePay/index.js +68 -35
  110. package/es/components/pay/toC/PaymentMethods/GooglePay/index.js +70 -42
  111. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +1 -0
  112. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
  113. package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +1 -0
  114. package/es/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +72 -41
  115. package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.d.ts +15 -0
  116. package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.js +143 -0
  117. package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less +34 -0
  118. package/es/components/pay/toC/PaymentMethods/hooks/index.d.ts +19 -0
  119. package/es/components/pay/toC/PaymentMethods/hooks/index.js +126 -0
  120. package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
  121. package/es/components/pay/toC/index.js +3 -2
  122. package/es/components/pay/toC/locales.d.ts +9 -0
  123. package/es/components/pay/toC/locales.js +12 -3
  124. package/es/components/pay/toC/model.d.ts +10 -1
  125. package/es/components/pay/toC/serve.d.ts +5 -0
  126. package/es/components/pay/toC/serve.js +9 -1
  127. package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +1 -0
  128. package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +1 -0
  129. package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +1 -0
  130. package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
  131. package/es/components/productExtension/fields/Actor/index.d.ts +1 -0
  132. package/es/components/productExtension/fields/Forms/index.d.ts +1 -0
  133. package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts +1 -0
  134. package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +1 -0
  135. package/es/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
  136. package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts +1 -0
  137. package/es/components/ruleSetting/ruleBorder/index.d.ts +1 -0
  138. package/es/components/schedules/calendar/calendarItem.d.ts +1 -0
  139. package/es/components/schedules/calendar/index.d.ts +1 -0
  140. package/es/components/schedules/components/CurrentDay/index.d.ts +1 -0
  141. package/es/components/schedules/components/ScheduleDetailList/index.d.ts +1 -0
  142. package/es/components/schedules/components/ScheduleList/index.d.ts +1 -0
  143. package/es/components/schedules/model.d.ts +9 -1
  144. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +1 -0
  145. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +1 -0
  146. package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts +1 -0
  147. package/es/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts +1 -0
  148. package/es/components/schedules/products/ProductDetailDrawer/index.d.ts +1 -0
  149. package/es/components/schedules/products/index.d.ts +1 -0
  150. package/es/components/schedules/products/list/ProductItem/index.d.ts +1 -0
  151. package/es/components/schedules/products/list/index.d.ts +1 -0
  152. package/es/components/schedules/resources/index.d.ts +1 -0
  153. package/es/components/schedules/resources/list/index.d.ts +1 -0
  154. package/es/components/schedules/resources/relationProduct/index.d.ts +1 -0
  155. package/es/components/schedules/schedules/AllSchedules/index.d.ts +1 -0
  156. package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +1 -0
  157. package/es/components/schedules/schedules/index.d.ts +1 -0
  158. package/es/components/shoppingCart/components/Empty/index.d.ts +1 -0
  159. package/es/components/shoppingCart/components/Render/index.d.ts +1 -0
  160. package/es/components/shoppingCart/hooks/useAddService.d.ts +1 -0
  161. package/es/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
  162. package/es/components/shoppingCart/index.d.ts +1 -0
  163. package/es/components/wallet/Detail/model.d.ts +13 -1
  164. package/es/components/wallet/DiscountCard/model.d.ts +14 -1
  165. package/es/components/wallet/PointCard/model.d.ts +13 -1
  166. package/es/components/wallet/RechargeableCard/model.d.ts +29 -1
  167. package/es/components/wallet/Voucher/model.d.ts +13 -1
  168. package/es/components/wallet/hooks/useWalletCard.d.ts +1 -0
  169. package/es/components/wallet/model.d.ts +9 -1
  170. package/es/components/workSpaceList/components/Modal/index.d.ts +1 -0
  171. package/es/hooks/usePaymentLogger.d.ts +1 -0
  172. package/es/plus/saasCreateOrganization/components/Header.d.ts +1 -0
  173. package/es/plus/saasRegister/components/EntryEmail.d.ts +1 -0
  174. package/es/plus/saasRegister/components/EntryInfo.d.ts +1 -0
  175. package/es/plus/saasRegister/components/GoLogin.d.ts +1 -0
  176. package/es/plus/saasRegister/components/Header.d.ts +1 -0
  177. package/es/plus/saasRegister/components/VerifyError.d.ts +1 -0
  178. package/es/plus/saasRegister/components/VerifyingLink.d.ts +1 -0
  179. package/es/plus/saasRegister/components/VertifyEmail.d.ts +1 -0
  180. package/lib/components/Sales/Summary/utils.d.ts +1 -1
  181. package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +1 -0
  182. package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts +1 -0
  183. package/lib/components/appointmentBooking/components/Cart/index.d.ts +1 -0
  184. package/lib/components/appointmentBooking/components/Deposit/index.d.ts +1 -0
  185. package/lib/components/appointmentBooking/components/Footer/index.d.ts +1 -0
  186. package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
  187. package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
  188. package/lib/components/booking/addons/model.d.ts +10 -1
  189. package/lib/components/booking/components/TabProduct/index.d.ts +1 -0
  190. package/lib/components/booking/components/TabProduct/productItem/index.d.ts +1 -0
  191. package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts +1 -0
  192. package/lib/components/booking/components/collapsibleList/utils.d.ts +1 -0
  193. package/lib/components/booking/components/emptyBooking/index.d.ts +1 -0
  194. package/lib/components/booking/components/footer/FooterMenus/index.d.ts +1 -0
  195. package/lib/components/booking/components/formItemChildrenWrap/index.d.ts +1 -0
  196. package/lib/components/booking/components/reloadResourceModal/index.d.ts +1 -0
  197. package/lib/components/booking/forms/model.d.ts +10 -1
  198. package/lib/components/booking/forms/sendModal/useSendModal.d.ts +1 -0
  199. package/lib/components/booking/forms/single/index.d.ts +1 -0
  200. package/lib/components/booking/forms/table/index.d.ts +1 -0
  201. package/lib/components/booking/hooks/useClearCart.d.ts +1 -0
  202. package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +1 -0
  203. package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +1 -0
  204. package/lib/components/booking/info/date/index.d.ts +1 -0
  205. package/lib/components/booking/info/dateRange/index.d.ts +1 -0
  206. package/lib/components/booking/info/model.d.ts +10 -1
  207. package/lib/components/booking/info/notes/index.d.ts +1 -0
  208. package/lib/components/booking/info/service/actions/index.d.ts +1 -0
  209. package/lib/components/booking/info/service/addService/utils.d.ts +1 -1
  210. package/lib/components/booking/info/service/like/index.d.ts +1 -0
  211. package/lib/components/booking/info2/service/actions/index.d.ts +1 -0
  212. package/lib/components/booking/info2/service/addService/utils.d.ts +1 -1
  213. package/lib/components/booking/materiels/contacts/index.d.ts +1 -0
  214. package/lib/components/booking/materiels/duration/index.d.ts +1 -0
  215. package/lib/components/booking/materiels/holder/index.d.ts +1 -0
  216. package/lib/components/booking/materiels/startTime/index.d.ts +1 -0
  217. package/lib/components/booking/model.d.ts +9 -1
  218. package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts +1 -0
  219. package/lib/components/booking/notes/NoteBlock/index.d.ts +1 -0
  220. package/lib/components/booking/notes/model.d.ts +10 -1
  221. package/lib/components/booking/payments/model.d.ts +10 -1
  222. package/lib/components/eftpos/deviceList/index.d.ts +1 -0
  223. package/lib/components/eftpos/form/index.d.ts +1 -0
  224. package/lib/components/eftpos/group/index.d.ts +1 -0
  225. package/lib/components/eftpos/hooks.d.ts +1 -0
  226. package/lib/components/eftpos/icon/apiKey.d.ts +1 -0
  227. package/lib/components/eftpos/icon/device.d.ts +1 -0
  228. package/lib/components/eftpos/index.d.ts +1 -0
  229. package/lib/components/eftpos/pos.d.ts +1 -0
  230. package/lib/components/eftpos/receipt/index.d.ts +1 -0
  231. package/lib/components/eftposPay/amount.d.ts +1 -0
  232. package/lib/components/eftposPay/app.d.ts +1 -1
  233. package/lib/components/eftposPay/component/alert/warn.d.ts +1 -0
  234. package/lib/components/eftposPay/component/fail/failCustom.d.ts +1 -0
  235. package/lib/components/eftposPay/component/fail/index.d.ts +1 -0
  236. package/lib/components/eftposPay/component/fail/network.d.ts +1 -0
  237. package/lib/components/eftposPay/component/fail/unknow.d.ts +1 -0
  238. package/lib/components/eftposPay/component/header/titlebar.d.ts +1 -0
  239. package/lib/components/eftposPay/component/manual/index.d.ts +1 -0
  240. package/lib/components/eftposPay/component/signature/index.d.ts +1 -0
  241. package/lib/components/eftposPay/component/step/index.d.ts +1 -0
  242. package/lib/components/eftposPay/component/step/step.d.ts +1 -0
  243. package/lib/components/eftposPay/hooks.d.ts +1 -1
  244. package/lib/components/eftposPay/pay.d.ts +1 -0
  245. package/lib/components/eftposPay/payo/config.d.ts +1 -0
  246. package/lib/components/eftposPay/store/index.d.ts +1 -1
  247. package/lib/components/eftposPay/tip.d.ts +1 -0
  248. package/lib/components/eftposPay/tyro/hooks.d.ts +1 -0
  249. package/lib/components/eftposPay/windcave/receiptAction.d.ts +1 -0
  250. package/lib/components/eftposPay/windcave/windcave.d.ts +1 -0
  251. package/lib/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
  252. package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +1 -0
  253. package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +1 -0
  254. package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +1 -0
  255. package/lib/components/eventBooking/components/Provider/Content/index.d.ts +1 -0
  256. package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
  257. package/lib/components/eventBooking/components/Provider/Event/index.d.ts +1 -0
  258. package/lib/components/eventBooking/components/Provider/Footer/index.d.ts +1 -0
  259. package/lib/components/eventBooking/components/Provider/Header/index.d.ts +1 -0
  260. package/lib/components/eventBooking/components/Provider/Information/index.d.ts +1 -0
  261. package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
  262. package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
  263. package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
  264. package/lib/components/eventBooking/components/Provider/Resource/index.d.ts +1 -0
  265. package/lib/components/eventBooking/components/Provider/SelectHolderModal.d.ts +1 -0
  266. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +1 -0
  267. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
  268. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
  269. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +1 -0
  270. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +1 -0
  271. package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +1 -0
  272. package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +1 -0
  273. package/lib/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts +1 -0
  274. package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts +1 -0
  275. package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +1 -0
  276. package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
  277. package/lib/components/login/index.d.ts +1 -0
  278. package/lib/components/pay/toC/PaymentMethods/ApplePay/index.js +27 -7
  279. package/lib/components/pay/toC/PaymentMethods/GooglePay/index.js +32 -8
  280. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +1 -0
  281. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +1 -0
  282. package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +1 -0
  283. package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js +30 -4
  284. package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.d.ts +15 -0
  285. package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.js +88 -0
  286. package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less +34 -0
  287. package/lib/components/pay/toC/PaymentMethods/hooks/index.d.ts +19 -0
  288. package/lib/components/pay/toC/PaymentMethods/hooks/index.js +90 -0
  289. package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
  290. package/lib/components/pay/toC/index.js +2 -1
  291. package/lib/components/pay/toC/locales.d.ts +9 -0
  292. package/lib/components/pay/toC/locales.js +12 -3
  293. package/lib/components/pay/toC/model.d.ts +10 -1
  294. package/lib/components/pay/toC/serve.d.ts +5 -0
  295. package/lib/components/pay/toC/serve.js +3 -0
  296. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +1 -0
  297. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +1 -0
  298. package/lib/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +1 -0
  299. package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
  300. package/lib/components/productExtension/fields/Actor/index.d.ts +1 -0
  301. package/lib/components/productExtension/fields/Forms/index.d.ts +1 -0
  302. package/lib/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts +1 -0
  303. package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +1 -0
  304. package/lib/components/productExtension/fields/SelectProducts/index.d.ts +1 -0
  305. package/lib/components/productExtension/fields/SelectResourcesTable/index.d.ts +1 -0
  306. package/lib/components/ruleSetting/ruleBorder/index.d.ts +1 -0
  307. package/lib/components/schedules/calendar/calendarItem.d.ts +1 -0
  308. package/lib/components/schedules/calendar/index.d.ts +1 -0
  309. package/lib/components/schedules/components/CurrentDay/index.d.ts +1 -0
  310. package/lib/components/schedules/components/ScheduleDetailList/index.d.ts +1 -0
  311. package/lib/components/schedules/components/ScheduleList/index.d.ts +1 -0
  312. package/lib/components/schedules/model.d.ts +9 -1
  313. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +1 -0
  314. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +1 -0
  315. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts +1 -0
  316. package/lib/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts +1 -0
  317. package/lib/components/schedules/products/ProductDetailDrawer/index.d.ts +1 -0
  318. package/lib/components/schedules/products/index.d.ts +1 -0
  319. package/lib/components/schedules/products/list/ProductItem/index.d.ts +1 -0
  320. package/lib/components/schedules/products/list/index.d.ts +1 -0
  321. package/lib/components/schedules/resources/index.d.ts +1 -0
  322. package/lib/components/schedules/resources/list/index.d.ts +1 -0
  323. package/lib/components/schedules/resources/relationProduct/index.d.ts +1 -0
  324. package/lib/components/schedules/schedules/AllSchedules/index.d.ts +1 -0
  325. package/lib/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +1 -0
  326. package/lib/components/schedules/schedules/index.d.ts +1 -0
  327. package/lib/components/shoppingCart/components/Empty/index.d.ts +1 -0
  328. package/lib/components/shoppingCart/components/Render/index.d.ts +1 -0
  329. package/lib/components/shoppingCart/hooks/useAddService.d.ts +1 -0
  330. package/lib/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
  331. package/lib/components/shoppingCart/index.d.ts +1 -0
  332. package/lib/components/wallet/Detail/model.d.ts +13 -1
  333. package/lib/components/wallet/DiscountCard/model.d.ts +14 -1
  334. package/lib/components/wallet/PointCard/model.d.ts +13 -1
  335. package/lib/components/wallet/RechargeableCard/model.d.ts +29 -1
  336. package/lib/components/wallet/Voucher/model.d.ts +13 -1
  337. package/lib/components/wallet/hooks/useWalletCard.d.ts +1 -0
  338. package/lib/components/wallet/model.d.ts +9 -1
  339. package/lib/components/workSpaceList/components/Modal/index.d.ts +1 -0
  340. package/lib/hooks/usePaymentLogger.d.ts +1 -0
  341. package/lib/plus/saasCreateOrganization/components/Header.d.ts +1 -0
  342. package/lib/plus/saasRegister/components/EntryEmail.d.ts +1 -0
  343. package/lib/plus/saasRegister/components/EntryInfo.d.ts +1 -0
  344. package/lib/plus/saasRegister/components/GoLogin.d.ts +1 -0
  345. package/lib/plus/saasRegister/components/Header.d.ts +1 -0
  346. package/lib/plus/saasRegister/components/VerifyError.d.ts +1 -0
  347. package/lib/plus/saasRegister/components/VerifyingLink.d.ts +1 -0
  348. package/lib/plus/saasRegister/components/VertifyEmail.d.ts +1 -0
  349. package/package.json +4 -4
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { RadioGroupProps } from 'antd';
2
3
  export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
3
4
  export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { Eftpos } from './const';
2
3
  /**
3
4
  * @title: tyro 设备连接
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const _default: ({ color }: {
2
3
  color?: string | undefined;
3
4
  }) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const _default: ({ color }: {
2
3
  color?: string | undefined;
3
4
  }) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { Eftpos, DeviceStatus } from './const';
2
3
  import './index.less';
3
4
  interface PosProps {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { DeviceProp } from "./const";
2
3
  interface PosProps {
3
4
  eftposName: string;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  /**
2
3
  * @title: 自定义组件设置
3
4
  * @description: 自定义组件设置
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { PosProps } from './const';
2
3
  /**
3
4
  * @title: 支付金额信息配置页
@@ -1,5 +1,5 @@
1
1
  import { PosProps, RouteType } from './const';
2
- declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
2
+ declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
3
3
  action: RouteType;
4
4
  device_number: string | number;
5
5
  api: ReturnType<PosProps['getApi']>;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const _default: () => JSX.Element;
2
3
  export default _default;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
3
4
  export default _default;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
3
4
  export default _default;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  /**
3
4
  * @title: 断网(客户端)提示页
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  /**
3
4
  * @title: 支付状态未知页面
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './titlebar.less';
2
3
  declare enum EPopupTitleBarVariantType {
3
4
  BackTitleClose = "back-title-cancel",
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  import './index.less';
3
4
  /**
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { ActionProps } from '../../const';
2
3
  /**
3
4
  * @title: 取消签名确认页
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { StatusType } from '../../const';
2
3
  declare const _default: (props: {
3
4
  status: StatusType;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const _default: (props: {
2
3
  status: string;
3
4
  pedding?: string;
@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
19
19
  readonly netRef: React.MutableRefObject<boolean | undefined>;
20
20
  readonly symbolRef: React.MutableRefObject<string>;
21
21
  readonly amountRef: React.MutableRefObject<string | number>;
22
- readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe" | "linkly">;
22
+ readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
23
23
  readonly clientRef: React.MutableRefObject<ClientEnum>;
24
24
  readonly dataRef: React.MutableRefObject<import("./store").State>;
25
25
  };
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { PayProps } from './const';
2
3
  import './index.less';
3
4
  /**
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import { StatusEnum } from '../const';
2
3
  export declare const POS: ({ api, onChange, }: {
3
4
  api: {
@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
297
297
  amount?: string | number | undefined;
298
298
  mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
299
299
  order_id?: string | number | undefined;
300
- eftpos?: "tyro" | "windcave" | "payo" | "stripe" | "linkly" | undefined;
300
+ eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
301
301
  action?: "amount" | "pay" | "deviceList" | undefined;
302
302
  key?: number | undefined;
303
303
  step?: number | undefined;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './tip.less';
2
3
  /**
3
4
  * @title: 支付状态未知页面
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  /**
2
3
  * @title: 获取 Tyro 资源
3
4
  * @description:
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  /**
2
3
  * @title: 按钮操作区
3
4
  * @description: 仅包含签名
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const _default: ({ api, onChange, formatAmount, }: {
2
3
  api: any;
3
4
  onChange: any;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const ErrorTip: ({ text }: any) => JSX.Element;
3
4
  export default ErrorTip;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const Deposit: () => JSX.Element;
2
3
  export default Deposit;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const CartItem: () => JSX.Element;
3
4
  export default CartItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Cart: ({ open, onCancel }: any) => JSX.Element;
3
4
  export default Cart;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Layout: () => JSX.Element;
3
4
  export default Layout;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const EmptyHolderModal: (props: any) => JSX.Element;
3
4
  export default EmptyHolderModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Event: () => JSX.Element;
3
4
  export default Event;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Footer: () => JSX.Element;
3
4
  export default Footer;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Header: () => JSX.Element;
3
4
  export default Header;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Information: () => JSX.Element;
3
4
  export default Information;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const InformationOptionsModal: (props: any) => JSX.Element;
3
4
  export default InformationOptionsModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const OrderProductModal: (props: any) => JSX.Element;
3
4
  export default OrderProductModal;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const RemoveOptionConfirmModal: (props: any) => JSX.Element;
2
3
  export default RemoveOptionConfirmModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Resource: () => JSX.Element;
3
4
  export default Resource;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const SelectHolderModal: (props: any) => JSX.Element;
2
3
  export default SelectHolderModal;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Status: (props: any) => JSX.Element;
3
4
  export default Status;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const WeekItem: (props: any) => JSX.Element;
3
4
  export default WeekItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare type CalenDateWeekProps = {
3
4
  currentDate: string;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const DayItem: (props: any) => JSX.Element;
3
4
  export default DayItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  import { CalendarItemProps } from '../../../../../type';
3
4
  declare const Item: (props: CalendarItemProps) => JSX.Element;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const Status: (props: any) => JSX.Element;
3
4
  export default Status;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const BookingOptions: (props: {
2
3
  onChangeBookingOption?: ((bookingOption: any) => void) | undefined;
3
4
  }) => JSX.Element;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const Resource: (props: any) => JSX.Element;
2
3
  export default Resource;
@@ -1,2 +1,3 @@
1
+ /// <reference types="react" />
1
2
  declare const Schedule: () => JSX.Element;
2
3
  export default Schedule;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare type Item = any;
3
4
  interface ProductItemProps {
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const ScheduleTimeItem: ({ timeList }: any) => JSX.Element;
3
4
  export default ScheduleTimeItem;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import "./index.less";
2
3
  export interface LoginProps {
3
4
  title: string;
@@ -35,15 +35,17 @@ module.exports = __toCommonJS(ApplePay_exports);
35
35
  var import_react = __toESM(require("react"));
36
36
  var import_materials = require("@pisell/materials");
37
37
  var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
38
+ var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
38
39
  var import_model = require("../../model");
39
40
  var import_utils = require("@pisell/utils");
40
41
  var import_payGroup = require("../../payGroup");
41
42
  var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
42
43
  var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
44
+ var import_hooks = require("../hooks");
43
45
  var import_index = require("./index.less");
44
46
  var import_utils2 = require("../../utils");
45
47
  var ApplePay = (props, ref) => {
46
- var _a, _b;
48
+ var _a, _b, _c, _d;
47
49
  const { state } = (0, import_react.useContext)(import_model.Context);
48
50
  const [open, setOpen] = (0, import_react.useState)(false);
49
51
  const context = (0, import_useEngineContext.default)();
@@ -52,8 +54,12 @@ var ApplePay = (props, ref) => {
52
54
  orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
53
55
  step: "2"
54
56
  });
57
+ const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
58
+ orderId: (_c = state.payGroup) == null ? void 0 : _c.order_id,
59
+ paymentType: "applePay"
60
+ });
55
61
  const init = async ({ payGroup }) => {
56
- var _a2, _b2, _c, _d, _e, _f, _g;
62
+ var _a2, _b2, _c2, _d2, _e, _f, _g;
57
63
  paymentLogger.addLog({
58
64
  key: "ApplePay初始化开始",
59
65
  value: ""
@@ -81,14 +87,14 @@ var ApplePay = (props, ref) => {
81
87
  value: ""
82
88
  });
83
89
  try {
84
- const locale = ((_c = dvaStore.core) == null ? void 0 : _c.translateLocale) || "en";
85
- const shopId = (_f = (_e = (_d = dvaStore.core) == null ? void 0 : _d.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
90
+ const locale = ((_c2 = dvaStore.core) == null ? void 0 : _c2.translateLocale) || "en";
91
+ const shopId = (_f = (_e = (_d2 = dvaStore.core) == null ? void 0 : _d2.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
86
92
  const currentURL = window.location.href;
87
93
  const linkElement = document.createElement("a");
88
94
  linkElement.href = currentURL;
89
95
  const shop_domain = linkElement.hostname;
90
96
  const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
91
- `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
97
+ `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}`,
92
98
  state.history
93
99
  )}`;
94
100
  paymentLogger.addLog({
@@ -96,7 +102,7 @@ var ApplePay = (props, ref) => {
96
102
  value: ""
97
103
  });
98
104
  paymentLogger.sendLogs("ApplePay跳转成功");
99
- window.location.href = _href;
105
+ await handleRedirect(_href);
100
106
  } catch (err) {
101
107
  paymentLogger.addLog({
102
108
  key: "ApplePay处理错误",
@@ -118,6 +124,10 @@ var ApplePay = (props, ref) => {
118
124
  init
119
125
  })
120
126
  );
127
+ const handleReturn = () => {
128
+ setOpen(false);
129
+ resetState();
130
+ };
121
131
  return /* @__PURE__ */ import_react.default.createElement(
122
132
  import_materials.PisellModal,
123
133
  {
@@ -128,11 +138,21 @@ var ApplePay = (props, ref) => {
128
138
  closable: false,
129
139
  bodyStyle: { padding: 0 }
130
140
  },
131
- /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
141
+ /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && // 跳转前展示 Loading
142
+ /* @__PURE__ */ import_react.default.createElement(
132
143
  import_ThreedsLoading.default,
133
144
  {
134
145
  title: import_utils.locales.getText("tocPay.text.connectingApplePay")
135
146
  }
147
+ ), isReturned && // 跳转后返回时展示新组件内容
148
+ /* @__PURE__ */ import_react.default.createElement(
149
+ import_PaymentReturnContent.default,
150
+ {
151
+ handleReturn,
152
+ state,
153
+ orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
154
+ unique_payment_number: state == null ? void 0 : state.front_order_uuid
155
+ }
136
156
  ))
137
157
  );
138
158
  };
@@ -41,8 +41,10 @@ var import_payGroup = require("../../payGroup");
41
41
  var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
42
42
  var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
43
43
  var import_utils2 = require("../../utils");
44
+ var import_hooks = require("../hooks");
45
+ var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
44
46
  var GooglePay = (props, ref) => {
45
- var _a, _b, _c;
47
+ var _a, _b, _c, _d, _e;
46
48
  const { state } = (0, import_react.useContext)(import_model.Context);
47
49
  const [open, setOpen] = (0, import_react.useState)(false);
48
50
  const context = (0, import_useEngineContext.default)();
@@ -52,12 +54,17 @@ var GooglePay = (props, ref) => {
52
54
  orderId: ((_c = state.payGroup) == null ? void 0 : _c.order_id) || "unknown",
53
55
  step: "2"
54
56
  });
57
+ const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
58
+ orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
59
+ paymentType: "googlePay"
60
+ });
55
61
  const init = async ({ payGroup }) => {
56
- var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k;
62
+ var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k;
57
63
  paymentLogger.addLog({
58
64
  key: "GooglePay初始化开始",
59
65
  value: ""
60
66
  });
67
+ setOpen(true);
61
68
  const utils = context.appHelper.utils || {};
62
69
  const dvaStore = (_b2 = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b2.getState();
63
70
  const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
@@ -79,15 +86,19 @@ var GooglePay = (props, ref) => {
79
86
  key: "GooglePay获取支付参数成功",
80
87
  value: ""
81
88
  });
82
- if (((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) && ((_f = (_e = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e.isAndroid_ios) == null ? void 0 : _f.call(_e)) === "android") {
89
+ if (((_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) && ((_f = (_e2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e2.isAndroid_ios) == null ? void 0 : _f.call(_e2)) === "android") {
83
90
  paymentLogger.addLog({
84
91
  key: "GooglePay使用Android客户端支付",
85
92
  value: ""
86
93
  });
87
94
  paymentLogger.sendLogs("GooglePay客户端支付");
88
- return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "google_pay", values, interaction });
95
+ return (0, import_utils2.clientPayment)({
96
+ order_id: payGroup.order_id,
97
+ type: "google_pay",
98
+ values,
99
+ interaction
100
+ });
89
101
  }
90
- setOpen(true);
91
102
  try {
92
103
  const locale = ((_g = dvaStore.core) == null ? void 0 : _g.translateLocale) || "en";
93
104
  const shopId = (_j = (_i = (_h = dvaStore.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop) == null ? void 0 : _j.id;
@@ -96,7 +107,7 @@ var GooglePay = (props, ref) => {
96
107
  linkElement.href = currentURL;
97
108
  const shop_domain = linkElement.hostname;
98
109
  const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
99
- `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
110
+ `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}`,
100
111
  state.history
101
112
  )}`;
102
113
  paymentLogger.addLog({
@@ -104,7 +115,7 @@ var GooglePay = (props, ref) => {
104
115
  value: ""
105
116
  });
106
117
  paymentLogger.sendLogs("GooglePay跳转成功");
107
- window.location.href = _href;
118
+ await handleRedirect(_href);
108
119
  } catch (err) {
109
120
  paymentLogger.addLog({
110
121
  key: "GooglePay处理错误",
@@ -126,6 +137,10 @@ var GooglePay = (props, ref) => {
126
137
  init
127
138
  })
128
139
  );
140
+ const handleReturn = () => {
141
+ setOpen(false);
142
+ resetState();
143
+ };
129
144
  return /* @__PURE__ */ import_react.default.createElement(
130
145
  import_materials.PisellModal,
131
146
  {
@@ -136,11 +151,20 @@ var GooglePay = (props, ref) => {
136
151
  closable: false,
137
152
  bodyStyle: { padding: 0 }
138
153
  },
139
- /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
154
+ /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && /* @__PURE__ */ import_react.default.createElement(
140
155
  import_ThreedsLoading.default,
141
156
  {
142
157
  title: import_utils.locales.getText("tocPay.text.connectingGooglePay")
143
158
  }
159
+ ), isReturned && // 跳转后返回时展示新组件内容
160
+ /* @__PURE__ */ import_react.default.createElement(
161
+ import_PaymentReturnContent.default,
162
+ {
163
+ handleReturn,
164
+ state,
165
+ orderId: (_e = state.payGroup) == null ? void 0 : _e.order_id,
166
+ unique_payment_number: state.front_order_uuid
167
+ }
144
168
  ))
145
169
  );
146
170
  };
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
2
3
  public_key: string;
3
4
  client_secret?: string | undefined;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.less';
2
3
  declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
3
4
  export default SetupForm;
@@ -1,3 +1,4 @@
1
+ /// <reference types="react" />
1
2
  import './index.module.less';
2
3
  declare const StripePayment: () => JSX.Element;
3
4
  export default StripePayment;