ordering-ui-react-native 0.22.4 → 0.22.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.22.04",
+  "version": "0.22.06",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/OrderDetails/Business.tsx

@@ -77,6 +77,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [printerSettings, setPrinterSettings] = useState('')
   const [autoPrintEnabled, setAutoPrintEnabled] = useState<boolean>(false)
 
+  const orderToComplete = [4,20,21]
+
   if (order?.status === 7 || order?.status === 4) {
     if (drivers?.length > 0 && drivers) {
       drivers.forEach((driver: any) => {
@@ -667,7 +669,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               disabled={loading}
             />
           )}
-          {order?.status === 4 && ![1].includes(order?.delivery_type) && (
+          {orderToComplete.includes(order?.status) && ![1].includes(order?.delivery_type) && (
             <FloatingButton
               btnText={t(
                 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',

package/themes/original/src/components/PaymentOptions/index.tsx

@@ -344,10 +344,11 @@ const PaymentOptionsUI = (props: any) => {
 						setAddCardOpen={setAddCardOpen}
 						addCardOpen={addCardOpen}
 						isOpenMethod={isOpenMethod}
-						handlePaymethodDataChange={handlePaymethodDataChange}
+						handleSource={handlePaymethodDataChange}
 						clientSecret={props.clientSecret}
 						businessId={props.businessId}
 						onPaymentChange={onPaymentChange}
+						paySelected={props.paySelected}
 					/>
 				</View>
 			)}
@@ -414,6 +415,7 @@ const PaymentOptionsUI = (props: any) => {
 						urlscheme={urlscheme}
 						androidAppId={androidAppId}
 						publicKeyAddCard={isOpenMethod?.paymethod?.credentials?.stripe?.publishable || isOpenMethod?.paymethod?.credentials?.publishable}
+						paySelected={props.paySelected}
 					/>
 				</KeyboardAvoidingView>
 			</OModal>
@@ -439,6 +441,7 @@ const PaymentOptionsUI = (props: any) => {
 						onCancel={() => handlePaymethodClick(null)}
 						publicKey={isOpenMethod?.paymethod?.credentials.publishable}
 						publicKeyAddCard={isOpenMethod?.paymethod?.credentials?.stripe?.publishable || isOpenMethod?.paymethod?.credentials?.publishable}
+						paySelected={props.paySelected}
 					/>
 				</View>
 			)}
@@ -489,6 +492,7 @@ const PaymentOptionsUI = (props: any) => {
 						publicKey={props.publicKey || isOpenMethod?.paymethod?.credentials?.publishable}
 						setCardsList={setCardList}
 						requirements={props.clientSecret}
+						handleSource={handlePaymethodDataChange}
 						onSelectCard={handlePaymethodDataChange}
 						onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
 						publicKeyAddCard={isOpenMethod?.paymethod?.credentials?.stripe?.publishable || isOpenMethod?.paymethod?.credentials?.publishable}

package/themes/original/src/components/StripeCardsList/index.tsx

@@ -31,6 +31,7 @@ export const StripeCardsListUI = (props: any) => {
 		handleCardClick,
 		onOpen,
 		gateway,
+		paySelected
 	} = props;
 
 	const theme = useTheme();
@@ -93,10 +94,9 @@ export const StripeCardsListUI = (props: any) => {
 				>
 					{cardsList.cards.map((card: any) => (
 						<OSItem key={card.id} isUnique={cardsList.cards.length} isInvalid={!card?.zipcode && validateZipcodeCard}>
-							{console.log(card?.zipcode && validateZipcodeCard)}
 							<OSItemContent onPress={() => handleCardSelected(card)}>
 								<View style={styles.viewStyle}>
-									{card.id === cardSelected?.id ? (
+									{(card.id === cardSelected?.id || card.id === paySelected?.data?.id) ? (
 										<OIcon
 											src={theme.images.general.radio_act}
 											width={16}