Fix build
This commit is contained in:
+1
-3
@@ -71,10 +71,8 @@
|
||||
"statistics": "گزارشات"
|
||||
},
|
||||
"shipment": {
|
||||
"dineIn": "سرو در فروشگاه",
|
||||
"customerPickup": "دریافت از محل",
|
||||
"deliveryCar": "تحویل به خودرو",
|
||||
"deliveryCourier": "بیرون بر"
|
||||
"deliveryCourier": "ارسال با پیک"
|
||||
},
|
||||
"slider": {
|
||||
"new_slider": "اسلایدر جدید",
|
||||
|
||||
@@ -98,7 +98,6 @@ const OrderDetails: FC = () => {
|
||||
// بررسی وضعیت pending (هم enum و هم string literal)
|
||||
const isPaymentPending = paymentStatus === PaymentStatusEnum.Pending || paymentStatus === 'pending'
|
||||
const isCourierDelivery = order.deliveryMethod?.method === DeliveryMethodEnum.DeliveryCourier
|
||||
const isDineInOrCarDelivery = order.deliveryMethod?.method === DeliveryMethodEnum.DineIn || order.deliveryMethod?.method === DeliveryMethodEnum.DeliveryCar
|
||||
const isCustomerPickup = order.deliveryMethod?.method === DeliveryMethodEnum.CustomerPickup
|
||||
|
||||
// نمایش دکمه تایید پرداخت نقدی
|
||||
@@ -149,17 +148,6 @@ const OrderDetails: FC = () => {
|
||||
})
|
||||
}
|
||||
|
||||
const handleDeliverToWaiter = () => {
|
||||
changeOrderStatus({
|
||||
orderId: order.id,
|
||||
status: OrderStatus.DELIVERED_TO_WAITER
|
||||
}, {
|
||||
onError: (error) => {
|
||||
toast.error(extractErrorMessage(error))
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const handleDeliverToReceptionist = () => {
|
||||
changeOrderStatus({
|
||||
orderId: order.id,
|
||||
@@ -233,7 +221,6 @@ const OrderDetails: FC = () => {
|
||||
showCancelButton={showCancelButton}
|
||||
isPreparing={isPreparing}
|
||||
isCourierDelivery={isCourierDelivery}
|
||||
isDineInOrCarDelivery={isDineInOrCarDelivery}
|
||||
isCustomerPickup={isCustomerPickup}
|
||||
isCanceled={isCanceled}
|
||||
isVerifyingPayment={isVerifyingPayment}
|
||||
@@ -241,7 +228,6 @@ const OrderDetails: FC = () => {
|
||||
onVerifyCashPayment={handleVerifyCashPayment}
|
||||
onSendToKitchen={handleSendToKitchen}
|
||||
onDeliverToCourier={handleDeliverToCourier}
|
||||
onDeliverToWaiter={handleDeliverToWaiter}
|
||||
onDeliverToReceptionist={handleDeliverToReceptionist}
|
||||
onCancelOrder={() => setShowCancelModal(true)}
|
||||
/>
|
||||
|
||||
@@ -7,7 +7,6 @@ interface OrderActionsProps {
|
||||
showCancelButton: boolean
|
||||
isPreparing: boolean
|
||||
isCourierDelivery: boolean
|
||||
isDineInOrCarDelivery: boolean
|
||||
isCustomerPickup: boolean
|
||||
isCanceled: boolean
|
||||
isVerifyingPayment: boolean
|
||||
@@ -15,7 +14,6 @@ interface OrderActionsProps {
|
||||
onVerifyCashPayment: () => void
|
||||
onSendToKitchen: () => void
|
||||
onDeliverToCourier: () => void
|
||||
onDeliverToWaiter: () => void
|
||||
onDeliverToReceptionist: () => void
|
||||
onCancelOrder: () => void
|
||||
}
|
||||
@@ -26,7 +24,6 @@ const OrderActions: FC<OrderActionsProps> = ({
|
||||
showCancelButton,
|
||||
isPreparing,
|
||||
isCourierDelivery,
|
||||
isDineInOrCarDelivery,
|
||||
isCustomerPickup,
|
||||
isCanceled,
|
||||
isVerifyingPayment,
|
||||
@@ -34,7 +31,6 @@ const OrderActions: FC<OrderActionsProps> = ({
|
||||
onVerifyCashPayment,
|
||||
onSendToKitchen,
|
||||
onDeliverToCourier,
|
||||
onDeliverToWaiter,
|
||||
onDeliverToReceptionist,
|
||||
onCancelOrder
|
||||
}) => {
|
||||
@@ -56,11 +52,6 @@ const OrderActions: FC<OrderActionsProps> = ({
|
||||
onDeliverToCourier()
|
||||
}
|
||||
|
||||
const handleDeliverToWaiter = () => {
|
||||
setLoadingAction('deliverToWaiter')
|
||||
onDeliverToWaiter()
|
||||
}
|
||||
|
||||
const handleDeliverToReceptionist = () => {
|
||||
setLoadingAction('deliverToReceptionist')
|
||||
onDeliverToReceptionist()
|
||||
@@ -102,15 +93,6 @@ const OrderActions: FC<OrderActionsProps> = ({
|
||||
/>
|
||||
)}
|
||||
|
||||
{isPreparing && isDineInOrCarDelivery && (
|
||||
<Button
|
||||
label='تحویل به گارسون'
|
||||
onClick={handleDeliverToWaiter}
|
||||
isloading={isChangingStatus && loadingAction === 'deliverToWaiter'}
|
||||
className='bg-purple-600 hover:bg-purple-700'
|
||||
/>
|
||||
)}
|
||||
|
||||
{isPreparing && isCustomerPickup && (
|
||||
<Button
|
||||
label='تحویل به رسپشنیست'
|
||||
|
||||
@@ -22,10 +22,8 @@ const PaymentInfo: FC<PaymentInfoProps> = ({
|
||||
|
||||
const getDeliveryMethodText = (method: string): string => {
|
||||
const methodMap: Record<string, string> = {
|
||||
[DeliveryMethodEnum.DineIn]: 'سرو در فروشگاه',
|
||||
[DeliveryMethodEnum.CustomerPickup]: 'دریافت از محل',
|
||||
[DeliveryMethodEnum.DeliveryCar]: 'تحویل به خودرو',
|
||||
[DeliveryMethodEnum.DeliveryCourier]: 'بیرون بر',
|
||||
[DeliveryMethodEnum.DeliveryCourier]: 'ارسال با پیک',
|
||||
}
|
||||
return methodMap[method] || method
|
||||
}
|
||||
@@ -34,7 +32,6 @@ const PaymentInfo: FC<PaymentInfoProps> = ({
|
||||
const methodMap: Record<string, string> = {
|
||||
[PaymentMethodEnum.Cash]: 'پرداخت نقدی',
|
||||
[PaymentMethodEnum.Online]: 'پرداخت آنلاین',
|
||||
[PaymentMethodEnum.CardOnDelivery]: 'پرداخت در محل',
|
||||
[PaymentMethodEnum.Wallet]: 'کیف پول',
|
||||
}
|
||||
return methodMap[method] || method
|
||||
|
||||
@@ -26,9 +26,7 @@ const CreateShipmentMethod: FC = () => {
|
||||
const [deliveryFeeType, setDeliveryFeeType] = useState<string>(DeliveryFeeTypeEnum.FIXED)
|
||||
|
||||
const shipmentMethods = [
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.DineIn}`), value: DeliveryMethodEnum.DineIn },
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.CustomerPickup}`), value: DeliveryMethodEnum.CustomerPickup },
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.DeliveryCar}`), value: DeliveryMethodEnum.DeliveryCar },
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.DeliveryCourier}`), value: DeliveryMethodEnum.DeliveryCourier },
|
||||
]
|
||||
|
||||
|
||||
@@ -28,9 +28,7 @@ const UpdateShipmentMethod: FC = () => {
|
||||
const [deliveryFeeType, setDeliveryFeeType] = useState<string>(DeliveryFeeTypeEnum.FIXED)
|
||||
|
||||
const shipmentMethods = [
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.DineIn}`), value: DeliveryMethodEnum.DineIn },
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.CustomerPickup}`), value: DeliveryMethodEnum.CustomerPickup },
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.DeliveryCar}`), value: DeliveryMethodEnum.DeliveryCar },
|
||||
{ label: t(`shipment.${DeliveryMethodEnum.DeliveryCourier}`), value: DeliveryMethodEnum.DeliveryCourier },
|
||||
]
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
export enum DeliveryMethodEnum {
|
||||
DineIn = "dineIn",
|
||||
CustomerPickup = "customerPickup",
|
||||
DeliveryCar = "deliveryCar",
|
||||
DeliveryCourier = "deliveryCourier",
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user