- Information
+ {t("Information")}
{/* Nested Form.List for sub-items */}
@@ -51,17 +71,17 @@ const ObjectField = () => {
{subFields.map((subField) => (
-
+
{
))}
)}
@@ -91,4 +111,4 @@ const ObjectField = () => {
);
};
-export default ObjectField;
+export default ObjectField
\ No newline at end of file
diff --git a/src/Pages/Categories/formUtil.ts b/src/Pages/Categories/formUtil.ts
index b585f4a..67bf305 100644
--- a/src/Pages/Categories/formUtil.ts
+++ b/src/Pages/Categories/formUtil.ts
@@ -3,34 +3,49 @@ import * as Yup from "yup";
import { buildFormData } from "../../api/helper/buildFormData";
interface formUtilCommon {
- number:number,
- value:number
+ number: number,
+ value: number
}
interface ObjectToEdit extends formUtilCommon {
- id?:number,
+ id?: number,
}
interface InitialValues extends ObjectToEdit {
}
-interface ValidateSchema extends formUtilCommon{
+interface ValidateSchema extends formUtilCommon {
}
export const getInitialValues = (objectToEdit: any | null = null): any => {
- console.log(objectToEdit,"objectToEdit");
return {
id: objectToEdit?.id ?? 0,
- name:objectToEdit?.name ?? "",
+ name: objectToEdit?.name ?? "",
name_ar: objectToEdit?.name?.ar ?? '',
name_en: objectToEdit?.name?.en ?? '',
name_de: objectToEdit?.name?.de ?? '',
- parent_id: objectToEdit?.parent_id ?? 1,
+ parent_id: objectToEdit?.parent_id ?? "",
photo: objectToEdit?.photo ?? '',
+ attribute: objectToEdit?.attribute ?? "",
+ new_attribute: objectToEdit?.attribute ?? ""
+
};
};
+export const getInitialValuesForAdd = (objectToEdit: any | null = null): any => {
+ return {
+ name_ar: '',
+ name_en: '',
+ name_de: '',
+ parent_id: "",
+ photo: '',
+ attribute: "",
+ new_attribute: ""
+
+ };
+};
+
export const getValidationSchema = (editMode: boolean = false): Yup.Schema
=> {
@@ -41,6 +56,7 @@ export const getValidationSchema = (editMode: boolean = false): Yup.Schema
name_de: Yup.string().required('Required'),
parent_id: Yup.string().required('Required'),
photo: Yup.string().required('Required'),
+
});
};
@@ -48,18 +64,18 @@ export const getValidationSchema = (editMode: boolean = false): Yup.Schema
export const getDataToSend = (values: any): FormData => {
const data = { ...values };
-
-
+
+
const formData = new FormData();
buildFormData(formData, data);
return formData;
};
-export const ChangeDataToPrint = (data:any)=>{
+export const ChangeDataToPrint = (data: any) => {
let new_array = data
- for(let i =0 ; i {
name: t("image"),
sortable: false,
center: "true",
- cell: (row:any) =>
+ cell: (row:any) => {
+ let str = row?.photo;
+ str = str?.replace(`public`, "/storage") ?? "";
+ return
+ }
+
},
{
name: t("parent_id"),
diff --git a/src/Pages/Coupon/FormProducts.tsx b/src/Pages/Coupon/FormProducts.tsx
deleted file mode 100644
index 22cd08d..0000000
--- a/src/Pages/Coupon/FormProducts.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-
-import React from 'react'
-import { Col, Row } from 'reactstrap';
-import KarimField from '../../Components/Karimalden/KarimField';
-import { useFormikContext } from 'formik';
-
-import { DatePicker } from 'antd';
-import { useTranslation } from 'react-i18next';
-
-function FormProduct() {
- const formik = useFormikContext();
- const [t] = useTranslation();
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default FormProduct
-
-
diff --git a/src/Pages/Coupon/Page.tsx b/src/Pages/Coupon/Page.tsx
new file mode 100644
index 0000000..5de1d36
--- /dev/null
+++ b/src/Pages/Coupon/Page.tsx
@@ -0,0 +1,44 @@
+
+import React from 'react'
+import DashBody from '../../Layout/Dashboard/DashBody'
+import DashHeader from '../../Layout/Dashboard/DashHeader'
+import LyTable from '../../Layout/Dashboard/LyTable'
+import useTableColumns from './useTableColumns'
+import { QueryStatusEnum } from '../../config/QueryStatus'
+import { useGetProduct } from '../../api/product'
+import { Button } from 'antd'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router-dom'
+import AddButton from '../../Layout/Dashboard/AddButton/AddButton'
+import { useGetCoupon } from '../../api/Coupon'
+
+function Page() {
+
+ const column =useTableColumns()
+ const {data ,status } = useGetCoupon()
+ const [t] = useTranslation()
+ const navigate = useNavigate()
+ const totalRows = data?.meta?.total;
+
+ return (
+ // Pass Status to Layout
+
+
+ navigate('/coupon/add')}>
+
+
+
+
+
+
+ )
+}
+
+export default Page
+
diff --git a/src/Pages/Coupon/View/AddForm.tsx b/src/Pages/Coupon/View/AddForm.tsx
new file mode 100644
index 0000000..48294bf
--- /dev/null
+++ b/src/Pages/Coupon/View/AddForm.tsx
@@ -0,0 +1,60 @@
+
+import React from 'react'
+import { Col, Row } from 'reactstrap';
+import ValidationField from '../../../Components/ValidationField/ValidationField';
+import { useFormikContext } from 'formik';
+
+import { DatePicker } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { isEmpty } from '../../../Hooks/isEmpty';
+import { useGetCategories } from '../../../api/Categories';
+import useFormatToSelect from '../../../Hooks/useFormatToSelect';
+import { useGetProduct } from '../../../api/product';
+
+function Form() {
+ const { values } = useFormikContext();
+ const [t] = useTranslation(); // FLAT coupn not be spacified && flate
+ const coupon_type = [{ lable: "general", value: "general" },{ lable: "specified", value: "specified" }]
+ const coupon_type_discount_flat = [{ lable: "general", value: "general" }]
+
+ const discount_type = [{ lable: "percentage", value: "percentage" },{ lable: "flat", value: "flat" }]
+ const { data: CategoriesData } = useGetCategories()
+ const { data: ProductData } = useGetProduct()
+
+ const SelectCategoriesData = useFormatToSelect(CategoriesData?.categories)
+ const SelectProductData = useFormatToSelect(ProductData?.BaseProducts)
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default Form
+
+
+
+
diff --git a/src/Pages/Coupon/View/AddPage.tsx b/src/Pages/Coupon/View/AddPage.tsx
index 6247fe6..b5cdadd 100644
--- a/src/Pages/Coupon/View/AddPage.tsx
+++ b/src/Pages/Coupon/View/AddPage.tsx
@@ -3,65 +3,68 @@ import { getInitialValues, getValidationSchema, getDataToSend } from '../formUti
import { Tab, TabList, TabPanel as TabBody, Tabs } from 'react-tabs'
import 'react-tabs/style/react-tabs.css';
import { MdLanguage } from 'react-icons/md'
-import { FaSadCry } from 'react-icons/fa'
import ViewPage from '../../../Layout/Dashboard/ViewPage';
-import { Rate } from 'antd';
-import BasicInfo from './BasicInfo';
-import { usePageState } from '../../../lib/state mangment/LayoutPagestate';
-import { useParams } from 'react-router-dom';
-import LoadingPage from '../../../Layout/app/LoadingPage';
import { useTranslation } from 'react-i18next';
-import { BsInfoCircle } from 'react-icons/bs';
-import BasicInfo2 from './BasicInfo2';
import useNavigateOnSuccess from '../../../Hooks/useNavigateOnSuccess';
-import { useAddProduct } from '../../../api/product';
+import { useAddCoupon } from '../../../api/Coupon';
+import Form from './AddForm';
+
+const AddCouponPage = () => {
+
+
+ const { mutate, isLoading, isSuccess } = useAddCoupon()
+ const handleSubmit = (values: any) => {
+
+ values.active_at = values.active[0].format('YYYY-MM-DD HH:mm:ss.SSS')
+ values.active_to = values.active[1].format('YYYY-MM-DD HH:mm:ss.SSS')
+ values.status = values.active ? "active" : "inactive"
+
-const AddProductPage = () => {
- const {mutate , isLoading , isSuccess} = useAddProduct()
- const [BarStatus, setBarStatus] = useState({ value: 0, isLoading: false, isError: false, isSuccess: false })
- const handleSubmit = (values:any)=>{
+const products = values?.product_attr?.map((item: any) => {
+ return { "itemable_type": "product", "itemable_id": item };
+})?.filter((item: any) => item.itemable_id !== "")|| [];
- console.log(values);
+const category = values?.category_attr?.map((item: any) => {
+ return { "itemable_type": "category", "itemable_id": item };
+})?.filter((item: any) => item.itemable_id !== "") || [];
- const formToSend = getDataToSend(values)
+values['items'] = [...products, ...category];
+
+console.log(values, "values");
+
+mutate(values)
+
+ };
+
+ const { t } = useTranslation();
+
+ useNavigateOnSuccess(isSuccess, '/Coupon')
- mutate(formToSend);
-
- }
- const {t} = useTranslation();
- useNavigateOnSuccess(isSuccess , '/products' )
-
-
-
- const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit, BarStatus };
+ const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit };
return (
-
-
-
-
-
{t("BasicInfo")}
-
{t("BasicInfo2")}
+
+
+
+
{t("BasicInfo")}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default BasicInfo
\ No newline at end of file
diff --git a/src/Pages/Coupon/View/BasicInfo2.tsx b/src/Pages/Coupon/View/BasicInfo2.tsx
deleted file mode 100644
index 378d320..0000000
--- a/src/Pages/Coupon/View/BasicInfo2.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import React from 'react'
-import { Col, Row } from 'reactstrap'
-import KarimField from '../../../Components/Karimalden/KarimField'
-import { useTranslation } from 'react-i18next';
-
-const BasicInfo2 = () => {
- const [t] = useTranslation();
-
- const categoryOption = [] as any
-
-
-
- return (
-
-
-
-
-
-
-
-
- {/* */}
-
-
-
-
-
-
-{/*
-
- */}
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default BasicInfo2
\ No newline at end of file
diff --git a/src/Pages/Coupon/View/EditForm.tsx b/src/Pages/Coupon/View/EditForm.tsx
new file mode 100644
index 0000000..48294bf
--- /dev/null
+++ b/src/Pages/Coupon/View/EditForm.tsx
@@ -0,0 +1,60 @@
+
+import React from 'react'
+import { Col, Row } from 'reactstrap';
+import ValidationField from '../../../Components/ValidationField/ValidationField';
+import { useFormikContext } from 'formik';
+
+import { DatePicker } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { isEmpty } from '../../../Hooks/isEmpty';
+import { useGetCategories } from '../../../api/Categories';
+import useFormatToSelect from '../../../Hooks/useFormatToSelect';
+import { useGetProduct } from '../../../api/product';
+
+function Form() {
+ const { values } = useFormikContext();
+ const [t] = useTranslation(); // FLAT coupn not be spacified && flate
+ const coupon_type = [{ lable: "general", value: "general" },{ lable: "specified", value: "specified" }]
+ const coupon_type_discount_flat = [{ lable: "general", value: "general" }]
+
+ const discount_type = [{ lable: "percentage", value: "percentage" },{ lable: "flat", value: "flat" }]
+ const { data: CategoriesData } = useGetCategories()
+ const { data: ProductData } = useGetProduct()
+
+ const SelectCategoriesData = useFormatToSelect(CategoriesData?.categories)
+ const SelectProductData = useFormatToSelect(ProductData?.BaseProducts)
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default Form
+
+
+
+
diff --git a/src/Pages/Coupon/View/EditPage.tsx b/src/Pages/Coupon/View/EditPage.tsx
new file mode 100644
index 0000000..5094d0c
--- /dev/null
+++ b/src/Pages/Coupon/View/EditPage.tsx
@@ -0,0 +1,89 @@
+import React, { useEffect, useState } from 'react'
+import {getInitialValuesForAdd as getInitialValues, getDataToSend } from '../formUtil'
+import { Tab, TabList, TabPanel as TabBody, Tabs } from 'react-tabs'
+import 'react-tabs/style/react-tabs.css';
+import { MdLanguage } from 'react-icons/md'
+import { FaSadCry } from 'react-icons/fa'
+import ViewPage from '../../../Layout/Dashboard/ViewPage';
+import { Rate } from 'antd';
+import { usePageState } from '../../../lib/state mangment/LayoutPagestate';
+import { useParams } from 'react-router-dom';
+import LoadingPage from '../../../Layout/app/LoadingPage';
+import { useTranslation } from 'react-i18next';
+import { BsInfoCircle } from 'react-icons/bs';
+import { useGetOneCoupon, useUpdateCoupon } from '../../../api/Coupon';
+import useNavigateOnSuccess from '../../../Hooks/useNavigateOnSuccess';
+import Form from './EditForm';
+
+const EditPage = () => {
+ const { setObjectToEdit, objectToEdit } = usePageState()
+ const { t } = useTranslation();
+ const { data } = useGetOneCoupon()
+ const { mutate, isSuccess } = useUpdateCoupon("put")
+ const FormatedData = data?.coupon;
+ const handleSubmit = (values: any) => {
+
+
+ values.active_at = values.active[0].format('YYYY-MM-DD HH:mm:ss.SSS')
+ values.active_to = values.active[1].format('YYYY-MM-DD HH:mm:ss.SSS')
+ values.status = values.active ? "active" : "inactive"
+
+
+ const products = values?.product_attr?.map((item: any) => {
+ return { "itemable_type": "product", "itemable_id": item };
+ })?.filter((item: any) => item.itemable_id !== "") || [];
+
+ const category = values?.category_attr?.map((item: any) => {
+ return { "itemable_type": "category", "itemable_id": item };
+ })?.filter((item: any) => item.itemable_id !== "") || [];
+
+ values['items'] = [...products, ...category];
+
+ console.log(values, "values");
+
+ mutate(values)
+ }
+
+ useNavigateOnSuccess(isSuccess, '/Coupon')
+
+
+ useEffect(() => {
+
+ setObjectToEdit(data?.coupon);
+
+ }, [data]);
+
+
+ const getValidationSchema = () => {
+ return null
+ };
+
+
+ const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit };
+
+
+ return (
+
+ {objectToEdit && data ?
+
+
+
+
{t("BasicInfo")}
+
+
+
+
+
+
+
+
+
+ :
}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default AddForm
-
-
diff --git a/src/Pages/Coupon2/CouponPage.tsx b/src/Pages/Coupon2/CouponPage.tsx
deleted file mode 100644
index cffad89..0000000
--- a/src/Pages/Coupon2/CouponPage.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-
-import React from 'react'
-import DashBody from '../../Layout/Dashboard/DashBody'
-import DashHeader from '../../Layout/Dashboard/DashHeader'
-import LyTable from '../../Layout/Dashboard/LyTable'
-import useTableColumns from './useTableColumns'
-import { useGetCoupon} from '../../api/Coupon'
-
-import { useTranslation } from 'react-i18next'
-import AddCouponModal from './AddCouponModal'
-import { QueryStatusEnum } from '../../config/QueryStatus'
-// import * as XLSX from 'ts-xlsx';
-
-function CouponPage() {
-
- const column =useTableColumns()
- const {data ,status } = useGetCoupon()
- const {t} = useTranslation();
-
-
- return (
-
-
-
-
-
-
-
- )
-}
-
-export default CouponPage
-
diff --git a/src/Pages/Coupon2/EditCoupon/EditForm.tsx b/src/Pages/Coupon2/EditCoupon/EditForm.tsx
deleted file mode 100644
index 690cbe2..0000000
--- a/src/Pages/Coupon2/EditCoupon/EditForm.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react'
-import { Col, Row } from "reactstrap";
-import KarimField from '../../../Components/Karimalden/KarimField';
-
-const CreateForm = () => {
-
-
- return (
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default CreateForm
\ No newline at end of file
diff --git a/src/Pages/Coupon2/EditCoupon/Page.tsx b/src/Pages/Coupon2/EditCoupon/Page.tsx
deleted file mode 100644
index 9d2ac65..0000000
--- a/src/Pages/Coupon2/EditCoupon/Page.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import FormPage from '../../../Layout/Dashboard/FormPage';
-import EditForm from './EditForm';
-import { getInitialValues, getValidationSchema } from '../formUtil';
-import { useParams } from 'react-router-dom';
-import KarimSpinner from '../../../Components/Karimalden/Ui/KarimSpinner';
-import { useAddCoupon, useGetOneCoupon } from '../../../api/Coupon';
-
-const EditPage = () => {
-
- const { id } = useParams()
- const { data,isLoading } = useGetOneCoupon({id})
- const {mutate} = useAddCoupon()
- const handleSubmit = (values: any) => {
- const newdata = {} as any;
-
- for (const key in data) {
- if (values[key] !== data[key]) {
- newdata[key] = values[key];
- }
- }
-
- return mutate(newdata);
- };
-
- return (
-
- handleSubmit(values)}
- initialValues={getInitialValues(data?.coupons)}
- validationSchema={getValidationSchema}
- title='Edit Coupon'
- >
-
-
-
-
- );
-};
-
-export default EditPage;
diff --git a/src/Pages/Home/Chart.tsx b/src/Pages/Home/Chart.tsx
new file mode 100644
index 0000000..d9b8545
--- /dev/null
+++ b/src/Pages/Home/Chart.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react';
+//@ts-ignore
+import { BarChart } from '@mui/x-charts/BarChart';
+import { axisClasses } from '@mui/x-charts';
+import { useTranslation } from 'react-i18next';
+
+const chartSetting = {
+ yAxis: [
+ {
+ label: 'rainfall (mm)',
+ },
+ ],
+ sx: {
+ [`.${axisClasses.left} .${axisClasses.label}`]: {
+ transform: 'translate(-20px, 0)',
+ },
+ },
+};
+
+
+const BarsDataset = () => {
+ const [t] = useTranslation()
+ const dataset = [
+ {london: 59, paris: 57, newYork: 86, seoul: 21, month: t('January')},
+ {london: 59, paris: 57, newYork: 86, seoul: 21, month: t('February')},
+ {london: 59, paris: 57, newYork: 86, seoul: 21, month: t('March')},
+ {london: 59, paris: 57, newYork: 86, seoul: 21, month: t('April')},
+
+ ];
+
+ const series = [
+ { dataKey: 'london', label: t('London'), valueFormatter: (value: number) => `${value}mm` },
+ { dataKey: 'paris', label: t('Paris'), valueFormatter: (value: number) => `${value}mm` },
+ { dataKey: 'newYork', label: t('New York'), valueFormatter: (value: number) => `${value}mm` },
+ { dataKey: 'seoul', label: t('Seoul'), valueFormatter: (value: number) => `${value}mm` },
+ ];
+
+ const months = dataset.map(data => data.month);
+
+ return (
+
+
+
+
+ );
+};
+
+export default BarsDataset;
diff --git a/src/Pages/Home/HomePage.tsx b/src/Pages/Home/HomePage.tsx
index 4c20a2b..c0d3ba3 100644
--- a/src/Pages/Home/HomePage.tsx
+++ b/src/Pages/Home/HomePage.tsx
@@ -1,87 +1,59 @@
import React from "react";
-// import StatisticsCard from "../../Components/Ui/StaticsCard/StaticCard";
+import StatisticsCard from "../../Components/Ui/StaticsCard/StaticCard";
import { FaRedRiver } from "react-icons/fa";
import { useTranslation } from "react-i18next";
-// import { ChartTypeEnum } from "../../enums/ChartTypeEnum";
-// import { Card, Col, Row } from "reactstrap";
-// import { AiOutlineUser } from 'react-icons/ai';
-// import { useGetStatistics } from "../../api/statistics";
-// import { BsCart3 } from "react-icons/bs";
-// import YearChart from "./YearChart";
-// import HighDriverRateTable from "./tables/HighDriverRate/HighDriverRateTable";
-// import LastOrderTable from "./tables/LastOrder/LastOrderTable";
-// import LoadingSpinner from "../../Components/Ui/LoadingSpinner";
-// import LoadingPage from "../../Layout/app/LoadingPage";
+import { Card, Col, Row } from "reactstrap";
+import { AiOutlineUser } from 'react-icons/ai';
+import { BsCart3 } from "react-icons/bs";
+import Chart from "./Chart";
export default function HomePage() {
-
- const { t } = useTranslation()
-
- // const { data: statistics, isLoading } = useGetStatistics({
- // order_daily_date: null
- // });
-
- // if(isLoading){
- // return
-
- // }
+ const { t } = useTranslation();
+ const cardsData = [
+ {
+ icon: ,
+ count: 20, // Example count
+ pathWhenClick: "products",
+ titleKey: "products",
+ contentKey: "Product_in_your_Application"
+ },
+ {
+ icon: ,
+ count: 20, // Example count
+ pathWhenClick: "categories",
+ titleKey: "categories",
+ contentKey: "categories_in_your_Application"
+ },
+ {
+ icon: ,
+ count: 20, // Example count
+ pathWhenClick: "order",
+ titleKey: "order",
+ contentKey: "Order_in_your_Application"
+ }
+ ];
return (
<>
-
-Home Page
- {/*
-
-
- }
- count={`${(statistics?.drivers_count) ?? 1}`}
- CardContent={t(`You_have`) + " " + ((statistics?.drivers_count) ?? 1) + " " + t(`Driver_in_your_Application`)}
- CardTitle={t("drivers")}
- />
-
-
-
-
-
- }
- count={`${(statistics?.users_count) ?? 1}`}
- CardContent={t(`You_have`) + " " + ((statistics?.users_count) ?? 1) + " " + t(`User_in_your_Application`)}
-
- pathWhenClick="customers"
- CardTitle={t("users")}
- />
-
-
-
-
-
-
- }
- count={`${(statistics?.orders_count) ?? 1}`}
- CardContent={t(`You_have`) + " " + ((statistics?.orders_count) ?? 1) + " " + t(`Order_in_your_Application`)}
- pathWhenClick="order"
- CardTitle={t('order')}
-
- />
-
-
+
+ {cardsData.map((card, index) => (
+
+
+
+
+
+ ))}
-
-
-
-
-
-
-
-
-
*/}
- {/*
-
- */}
-
+
+
+
+
+
);
}
diff --git a/src/Pages/Home/tables/LastOrder/useTableColumn.tsx b/src/Pages/Home/tables/LastOrder/useTableColumn.tsx
index a65833d..044beea 100644
--- a/src/Pages/Home/tables/LastOrder/useTableColumn.tsx
+++ b/src/Pages/Home/tables/LastOrder/useTableColumn.tsx
@@ -12,12 +12,13 @@ const useTableColumns = () => {
() => [
{
- name: t("driver_name"),
+ name: t("order_code"),
sortable: false,
center: true,
cell:(row:any)=>{
-
- return (row?.driver?.full_name)
+ console.log(row);
+
+ return (row?.order_code)
}
},
@@ -26,15 +27,14 @@ const useTableColumns = () => {
name: t("order_total"),
sortable: true,
center: true,
- selector:"average_cost"
+ cell:(row)=>row["order_total"]
},
{
name: t("order_status"),
sortable: false,
center: true,
cell:(row:any)=>{t(row.status)}
+ padding:8, color:'black',borderRadius:10,fontSize:10}}>{t(row.order_status)}
},
{
diff --git a/src/Pages/Home/tables/HighDriverRate/HighDriverRateTable.tsx b/src/Pages/Home/tables/LastUser/LastUserTable.tsx
similarity index 78%
rename from src/Pages/Home/tables/HighDriverRate/HighDriverRateTable.tsx
rename to src/Pages/Home/tables/LastUser/LastUserTable.tsx
index 2f2634a..ce889a2 100644
--- a/src/Pages/Home/tables/HighDriverRate/HighDriverRateTable.tsx
+++ b/src/Pages/Home/tables/LastUser/LastUserTable.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
import { LoadingButton } from '../../../../Components/Ui/LoadingButton';
import { useNavigate } from 'react-router-dom';
- export default function HighDriverRateTable({ most_driver_rate }:any) {
+ export default function LastUserTable({ most_driver_rate }:any) {
const columns = useTableColumns();
const {t} = useTranslation();
const navigate = useNavigate()
@@ -16,11 +16,11 @@ import { useNavigate } from 'react-router-dom';
return (
- {t("high_drivers_rate")}
+ {t("last_users")}
- navigate("/Drivers" , {replace:true})}>
- {t("show_all_driver")}
-
+ {/* navigate("/user" , {replace:true})}>
+ {t("show_all_users")}
+ */}
diff --git a/src/Pages/Home/tables/HighDriverRate/useTableColumn.tsx b/src/Pages/Home/tables/LastUser/useTableColumn.tsx
similarity index 51%
rename from src/Pages/Home/tables/HighDriverRate/useTableColumn.tsx
rename to src/Pages/Home/tables/LastUser/useTableColumn.tsx
index 35e1775..8613a6b 100644
--- a/src/Pages/Home/tables/HighDriverRate/useTableColumn.tsx
+++ b/src/Pages/Home/tables/LastUser/useTableColumn.tsx
@@ -7,9 +7,10 @@ import { Rating } from "react-simple-star-rating";
interface RowData {
- driver_name: string;
- rate: number;
- driver_id: string;
+ name:string ,
+ phone:string ,
+ email:string ,
+ id:number
}
const useTableColumns = () => {
@@ -22,29 +23,33 @@ const useTableColumns = () => {
name: t("full_name"),
sortable: false,
center: true,
- cell: (row: RowData) => row?.driver_name,
+ cell: (row: RowData) => row?.name,
},
{
- name: t("rate"),
+ name: t("email"),
sortable: false,
center: true,
- cell: (row: RowData) => (
-
- ),
+ cell: (row: RowData) => row?.email,
},
{
- name: "#",
- selector: "action",
+ name: t("phone"),
sortable: false,
center: true,
- cell: (row: RowData) => (
- navigate(`/information/driver/${row?.driver_id}`, {replace:true})}
- size={22}
- style={{ cursor: "pointer" }}
- />
- ),
+ cell: (row: RowData) => row?.phone,
},
+ // {
+ // name: "#",
+ // selector: "action",
+ // sortable: false,
+ // center: true,
+ // cell: (row: RowData) => (
+ // navigate(`/user/${row?.id}`, {replace:true})}
+ // size={22}
+ // style={{ cursor: "pointer" }}
+ // />
+ // ),
+ // },
];
return columns;
diff --git a/src/Pages/Products/ProductsPage.tsx b/src/Pages/Products/ProductsPage.tsx
index b615214..0d111f6 100644
--- a/src/Pages/Products/ProductsPage.tsx
+++ b/src/Pages/Products/ProductsPage.tsx
@@ -14,21 +14,22 @@ function ProductsPage() {
const column =useTableColumns()
const {data ,status } = useGetProduct()
- console.log(data);
const [t] = useTranslation()
const navigate = useNavigate()
-
+ const totalRows = data?.meta?.total;
+
return (
- // Pass Status to Layout
-
- navigate('/products/add')}>
-
+
+ navigate('/products/add')}>
+
diff --git a/src/Pages/Products/View/AddPage.tsx b/src/Pages/Products/View/AddPage.tsx
index e409562..599dd79 100644
--- a/src/Pages/Products/View/AddPage.tsx
+++ b/src/Pages/Products/View/AddPage.tsx
@@ -1,62 +1,102 @@
-import React, { useEffect, useState } from 'react'
-import { getInitialValues, getValidationSchema, getDataToSend } from '../formUtil'
+import React, { useEffect, useState } from 'react'
+import {getInitialValuesAdd as getInitialValues, getValidationSchema, getDataToSend } from '../formUtil'
import { Tab, TabList, TabPanel as TabBody, Tabs } from 'react-tabs'
import 'react-tabs/style/react-tabs.css';
import { MdLanguage } from 'react-icons/md'
-import { FaCheck, FaSadCry } from 'react-icons/fa'
import ViewPage from '../../../Layout/Dashboard/ViewPage';
-import { Rate } from 'antd';
import BasicInfo from './BasicInfo';
-import { usePageState } from '../../../lib/state mangment/LayoutPagestate';
-import { useParams } from 'react-router-dom';
-import LoadingPage from '../../../Layout/app/LoadingPage';
import { useTranslation } from 'react-i18next';
import { BsInfoCircle } from 'react-icons/bs';
-import BasicInfo2 from './BasicInfo2';
import useNavigateOnSuccess from '../../../Hooks/useNavigateOnSuccess';
-import { useAddProduct } from '../../../api/product';
+import { useAddProduct, useAddProductVariation } from '../../../api/product';
import VarianInfo from './VarianInfo';
+import { usePageState } from '../../../lib/state mangment/LayoutPagestate';
const AddProductPage = () => {
- const { mutate, isLoading, isSuccess } = useAddProduct()
- const [BarStatus, setBarStatus] = useState({ value: 0, isLoading: false, isError: false, isSuccess: false })
- const [IsValed, setIsValed] = useState(1)
+ const { mutate, isLoading , data, isSuccess } = useAddProduct()
+ const { mutate:AddVariation, isSuccess:SuccessVariation } = useAddProductVariation()
+
+ const [IsValed, setIsValed] = useState(false)
+ const [infotaps , setInfoTaps] = useState([])
+
+ const [Varibletaps , setVaribleTaps] = useState([])
+
const handleSubmit = (values: any) => {
-
- values['name'] = {
- "en" : values.name_en,
- "ar" : values.name_ar,
- "de" : values.name_de,
- }
- values['description'] = {
- "en" : values.description_en,
- "ar" : values.description_ar,
- "de" : values.description_de,
- }
-
-
- const infoArray = Object.entries(values.info).map(([key, value]: [string, any]) => ({
- [key.split('.')[1]]: value
- }));
- values["info"]= infoArray
-
- console.log(infoArray);
-
- // mutate(values);
- // console.log(values);
+ setInfoTaps(values?.info?.slice(1)?.map((taps:any) => {
+ return (changeShapeInfo(taps));
+
+ }));
+
+ setVaribleTaps(values?.variable?.slice(1))
+ mutate({
+ name:{
+ en:values?.name_en,
+ ar:values?.name_ar,
+ de:values?.name_de
+ },
+ category_id:1
+ })
}
+ useEffect(()=>{
+
+ if(isSuccess){
+ const baseProductId = (data as any )?.id ;
+ console.log(infotaps);
+ console.log(Varibletaps);
+
+ Varibletaps?.map((dataToSend:any , index:number)=>{
+
+ const varible = dataToSend
+ const info = infotaps[index]
+ const jsonString = JSON.stringify(info);
+
+ const Newproduct = {
+ name:{
+ en:varible?.name_en,
+ ar:varible?.name_ar,
+ de:varible?.name_de
+ },
+ description:{
+ en:varible?.description_en,
+ ar:varible?.description_ar,
+ de:varible?.description_de
+ },
+ quantity:varible?.quantity,
+ main_photo:varible?.main_photo,
+ images:varible?.images,
+ info : jsonString,
+ product_attributes:[
+ {attribute_value_id: 1, attribute_id: 1}
+ ],
+ base_product_id:baseProductId
+ }
+ console.log(Newproduct);
+
+ AddVariation(Newproduct)
+ })
+
+ }
+ },[isSuccess])
+
+
+ const { setObjectToEdit, objectToEdit } = usePageState()
+
+ useEffect(() => {
+ setObjectToEdit([]);
+ }, []);
+
const { t } = useTranslation();
- useNavigateOnSuccess(isSuccess, '/products')
+ useNavigateOnSuccess(SuccessVariation, '/products')
- const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit, BarStatus };
+ const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit };
return (
@@ -65,14 +105,14 @@ const AddProductPage = () => {
-
{t("Base_info")} {IsValed ? : "" }
+
{t("Base_info")}
-
{t("VarianInfo")}
+
{t("VarianInfo")}
-
+
@@ -88,4 +128,20 @@ const AddProductPage = () => {
}
-export default AddProductPage
\ No newline at end of file
+export default AddProductPage
+
+
+function changeShapeInfo(originalObject:any){
+ const transformedObject:any = {};
+
+for (const key in originalObject) {
+ if (originalObject.hasOwnProperty(key)) {
+ const index = key.split('.')[0]; // Extract index from key
+ const attribute = key.split('.')[1]; // Extract attribute from key
+
+ transformedObject[originalObject[`${index}.key`]] = originalObject[`${index}.Description`];
+ }
+}
+
+return transformedObject
+}
\ No newline at end of file
diff --git a/src/Pages/Products/View/Atteibute.tsx b/src/Pages/Products/View/Atteibute.tsx
new file mode 100644
index 0000000..853615e
--- /dev/null
+++ b/src/Pages/Products/View/Atteibute.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { useFormikContext } from 'formik';
+import ValidationField from '../../../Components/ValidationField/ValidationField';
+import { useGetSingleAttribute } from '../../../api/attribute';
+
+const Attribute = () => {
+ const { values, setFieldValue } = useFormikContext();
+
+ const { data: attributeData } = useGetSingleAttribute({ name: "product_id", id: values?.id });
+
+ const handleAttributeChange = (name: string, value: any) => {
+ setFieldValue(`attribute[${name}]`, value);
+ };
+
+ return (
+ attributeData?.data?.map((item: any) => {
+ const options = item?.attribute_value?.map((attr: any) => ({
+ label: attr?.value,
+ value: attr?.attribute_id
+ }));
+
+ return (
+ handleAttributeChange(item?.name, value)}
+ />
+ );
+ })
+ );
+};
+
+export default Attribute;
diff --git a/src/Pages/Products/View/BasicInfo.tsx b/src/Pages/Products/View/BasicInfo.tsx
index 346f7f3..48d7d66 100644
--- a/src/Pages/Products/View/BasicInfo.tsx
+++ b/src/Pages/Products/View/BasicInfo.tsx
@@ -1,35 +1,41 @@
import React, { useEffect, useState } from 'react'
import { Col, Row } from 'reactstrap'
-import KarimField from '../../../Components/Karimalden/KarimField'
+import ValidationField from '../../../Components/ValidationField/ValidationField'
import { useTranslation } from 'react-i18next';
import { useFormikContext } from 'formik';
+import { toast } from 'react-toastify';
+import { useGetCategories } from '../../../api/Categories';
+import useFormatToSelect from '../../../Hooks/useFormatToSelect';
-const BasicInfo = ({setIsValed}:any) => {
+const BasicInfo = ({ setIsValed, IsValed }: any) => {
const [t] = useTranslation();
const formikContext = useFormikContext();
- const { values, submitForm,isValid } = formikContext;
+ const { values, isValid } = formikContext;
+ const { data } = useGetCategories()
+ const SelectData = useFormatToSelect(data?.categories)
useEffect(() => {
- //@ts-ignore
- if (values.name_ar !== "" && values.name_en !== "" && values.name_de !== "" && values.main_photo !== "" && values.category_id !== "" ) {
- setIsValed(1);
- console.log(isValid, 'isValid');
- } else {
- console.log(values);
- }
- }, [isValid,values]);
-
+ const { name_ar, name_en, name_de, main_photo, category_id } = values as any;
+ if (name_ar && name_en && name_de && main_photo && category_id && IsValed === false) {
+ toast.success(t("view_information_filed_fill_sucsessfully"));
+ setIsValed(true)
+ } else {
+ // console.log(isValid, "isValid");
+ }
+ }, [values]);
+
+
return (
-
-
-
+
+
-
-
+
+ {/* */}
+
diff --git a/src/Pages/Products/View/BasicInfo2.tsx b/src/Pages/Products/View/BasicInfo2.tsx
deleted file mode 100644
index 30b91f9..0000000
--- a/src/Pages/Products/View/BasicInfo2.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react'
-import { Col, Row } from 'reactstrap'
-import KarimField from '../../../Components/Karimalden/KarimField'
-import { useTranslation } from 'react-i18next';
-import ObjectField from './ObjectField';
-
-const BasicInfo2 = () => {
- const [t] = useTranslation();
-
- const categoryOption = [] as any
-
-
-
- return (
-
-
- {/* */}
-
-
-
- {/* */}
- {/* */}
- {/* */}
-
-
-
-
-
- )
-}
-
-export default BasicInfo2
\ No newline at end of file
diff --git a/src/Pages/Products/View/Edit/BasicInfo.tsx b/src/Pages/Products/View/Edit/BasicInfo.tsx
new file mode 100644
index 0000000..8844ddc
--- /dev/null
+++ b/src/Pages/Products/View/Edit/BasicInfo.tsx
@@ -0,0 +1,45 @@
+import React, { useEffect, useState } from 'react'
+import { Col, Row } from 'reactstrap'
+import ValidationField from '../../../../Components/ValidationField/ValidationField'
+import { useTranslation } from 'react-i18next';
+import { useFormikContext } from 'formik';
+import { toast } from 'react-toastify';
+import { useGetCategories } from '../../../../api/Categories';
+import useFormatToSelect from '../../../../Hooks/useFormatToSelect';
+
+const BasicInfo = ({ setIsValed, IsValed }: any) => {
+ const [t] = useTranslation();
+ const formikContext = useFormikContext();
+ const { values, isValid } = formikContext;
+ const { data } = useGetCategories()
+ const SelectData = useFormatToSelect(data?.categories)
+
+ useEffect(() => {
+ const { name_ar, name_en, name_de, main_photo, category_id } = values as any;
+
+ if (name_ar && name_en && name_de && main_photo && category_id && IsValed === false) {
+ toast.success(t("view_information_filed_fill_sucsessfully"));
+ setIsValed(true)
+ } else {
+ // console.log(isValid, "isValid");
+ }
+ }, [values]);
+
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default BasicInfo
\ No newline at end of file
diff --git a/src/Pages/Products/View/Edit/FormikTab/Field/Atteibute.tsx b/src/Pages/Products/View/Edit/FormikTab/Field/Atteibute.tsx
new file mode 100644
index 0000000..4c3812d
--- /dev/null
+++ b/src/Pages/Products/View/Edit/FormikTab/Field/Atteibute.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import { useFormikContext } from 'formik';
+import ValidationField from '../../../../../../Components/ValidationField/ValidationField';
+import { useGetSingleAttribute } from '../../../../../../api/attribute';
+
+const Attribute = ({data,tabKey}:any) => {
+ const { values, setFieldValue } = useFormikContext();
+
+
+ const handleAttributeChange = (name: string, value: any) => {
+ setFieldValue(`variable.${tabKey}.attribute"[${name}]`, value);
+ };
+
+ return (
+ data?.map((item: any) => {
+ const options = item?.attribute_value?.map((attr: any) => ({
+ label: attr?.value,
+ value: attr?.attribute_id
+ }));
+
+ return (
+ handleAttributeChange(item?.name, value)}
+ />
+ );
+ })
+ );
+};
+
+export default Attribute;
diff --git a/src/Pages/Products/View/Edit/FormikTab/Field/File.tsx b/src/Pages/Products/View/Edit/FormikTab/Field/File.tsx
new file mode 100644
index 0000000..6b4f943
--- /dev/null
+++ b/src/Pages/Products/View/Edit/FormikTab/Field/File.tsx
@@ -0,0 +1,64 @@
+
+
+
+import { Button, Upload, UploadFile } from 'antd'
+import { UploadOutlined } from '@ant-design/icons';
+import { useTranslation } from 'react-i18next';
+import { useFormikContext } from 'formik';
+import { ImageBaseURL } from '../../../../../../api/config';
+
+
+const File = ({ tabKey}:any) => {
+ const { t } = useTranslation();
+ const formik = useFormikContext();
+ const name = `variable[${tabKey}].${"main_photo"}`;
+ const imageUrl = formik?.values?.variable[tabKey]?.main_photo ? ImageBaseURL + formik?.values?.variable[tabKey]?.main_photo : "" ;
+ console.log(imageUrl);
+
+ const fileList: UploadFile[] = [
+
+ {
+ uid: '-1',
+ name: formik?.values?.variable[tabKey]?.main_photo?.name ?? "",
+ status: 'done',
+ url: imageUrl ,
+ thumbUrl: imageUrl ,
+ }
+ ];
+ const FilehandleChange = (value:any) => {
+
+ formik.setFieldValue(name, value.file.originFileObj)
+
+ };
+ const customRequest = async ({ onSuccess}: any) => {
+ onSuccess();
+ };
+ return (
+
+
+
+
+ }>
+ { t("upload_image") }
+
+
+
+
+
+
+
+ )
+}
+
+export default File
\ No newline at end of file
diff --git a/src/Pages/Products/View/Edit/FormikTab/Field/FileImage.tsx b/src/Pages/Products/View/Edit/FormikTab/Field/FileImage.tsx
new file mode 100644
index 0000000..d214314
--- /dev/null
+++ b/src/Pages/Products/View/Edit/FormikTab/Field/FileImage.tsx
@@ -0,0 +1,50 @@
+import { Button, Upload, UploadFile } from 'antd';
+import { UploadOutlined } from '@ant-design/icons';
+import { useTranslation } from 'react-i18next';
+import { useFormikContext } from 'formik';
+import { BaseURL_IMAGE } from '../../../../../../api/config';
+
+const MaltyFile = ({ tabKey }: any) => {
+ const { t } = useTranslation();
+ const formik = useFormikContext();
+ const name = `variable[${tabKey}].Images`;
+
+ const imageFiles = formik.values?.variable?.[tabKey]?.Images || [];
+ const defaultFileList = imageFiles?.map((file: any, index: number) => ({
+ uid: `-${index}`,
+ name: file?.name, // Use a default name if file.name is undefined
+ status: 'done',
+ url: file ? URL.createObjectURL(file) : BaseURL_IMAGE + file?.path?.replace("public", "/storage"),
+ thumbUrl: file ?URL.createObjectURL(file):"",
+ }));
+
+ const FilehandleChange = ({ fileList }: { fileList: any }) => {
+ formik.setFieldValue(name, fileList.map((file: any) => file?.originFileObj));
+ };
+
+ const customRequest = async ({ onSuccess }: any) => {
+ onSuccess();
+ };
+
+ return (
+
+
+
+ }>
+ {t("upload_image")}
+
+
+
+ );
+}
+
+export default MaltyFile;
diff --git a/src/Components/Karimalden/View/Object.tsx b/src/Pages/Products/View/Edit/FormikTab/Field/Object.tsx
similarity index 72%
rename from src/Components/Karimalden/View/Object.tsx
rename to src/Pages/Products/View/Edit/FormikTab/Field/Object.tsx
index 82f2f77..b82983e 100644
--- a/src/Components/Karimalden/View/Object.tsx
+++ b/src/Pages/Products/View/Edit/FormikTab/Field/Object.tsx
@@ -2,27 +2,51 @@ import React, { useEffect, useState } from 'react';
import { CloseOutlined } from '@ant-design/icons';
import { Button, Card, Form, Input, Space, Typography } from 'antd';
import { useFormikContext } from 'formik';
+import { objectToArray } from '../../../../../../utils/Array/ArrayToObjectFormik';
+import { useTranslation } from 'react-i18next';
-const ObjectField = ({value , onChange}:any) => {
+const ObjectField = ({tabKey}:any) => {
const [form] = Form.useForm();
const formik = useFormikContext();
- const [FieldItems, setFieldItems] = useState([])
+ const [FieldItems, setFieldItems] = useState(formik?.values?.info[tabKey])
+ const [t] = useTranslation()
const handleChange = (e: React.ChangeEvent) => {
const { name, value } = e.target;
- setFieldItems((prevState:any) => ({
- ...prevState,
- [name]: value
- }));
- formik.setFieldValue("info", FieldItems)
+ setFieldItems((prevState:any) =>{
+
+ formik.setFieldValue(`info.${tabKey}`, {
+ ...prevState,
+ [name]: value
+ });
+
+ return ({
+ ...prevState,
+ [name]: value
+ })
+ } )
+
};
+
useEffect(() => {
- form.setFieldsValue({
- items: [{ list: [{ Attribute: '', Description: '' }] }]
- });
-
- }, []);
+
+ if (formik?.values?.info[tabKey]) {
+ const defaultValues = formik.values.info[tabKey];
+
+ console.log(objectToArray( formik?.values?.info[tabKey]));
+
+ form.setFieldsValue({
+ items: [{ list:objectToArray( formik?.values?.info[tabKey])}]
+
+ });
+ }
+ else {
+ form.setFieldsValue({
+ items: [{ list: [{ key: '', Description: '' }] },], });
+ }
+ }, []); // Update when tabKey or info[tabKey] changes
+
return (