Merge pull request #17 from purwadhikafullstack/development

Development
purwadhikafullstack · Jul 17, 2024 · b6ac563 · b6ac563
2 parents 02b6981 + b599b2f
commit b6ac563
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/apps/api/src/actions/discount.action.ts b/apps/api/src/actions/discount.action.ts
@@ -1,3 +1,4 @@
+import { DISCOUNT_UNIT } from "@/constants/discount.constant";
 import { HttpException } from '@/exceptions/HttpException';
 import {
   IDiscount,
@@ -19,6 +20,10 @@ const createDiscountAction = async (
   discountData: IDiscount,
 ): Promise<Discount> => {
   try {
+    if (discountData.unit === DISCOUNT_UNIT.percentage && discountData.amount > 100) {
+      throw new Error("Amount can not more than 100%");
+    }
+
     const discount = await createDiscountQuery(discountData);
     return discount;
   } catch (err) {

diff --git a/apps/api/src/constants/discount.constant.ts b/apps/api/src/constants/discount.constant.ts
@@ -10,4 +10,12 @@ export const DISCOUNT_TYPE: {
   buy1Get1: "Buy 1 Get 1",
   freeShipping: "Free Shipping",
   referralCode: "Referral Code",
+}
+
+export const DISCOUNT_UNIT: {
+  amount: string;
+  percentage: string;
+} = {
+  amount: "Amount",
+  percentage: "Percentage",
 }
diff --git a/apps/web/src/app/admin/(store-admin)/discounts/page.tsx b/apps/web/src/app/admin/(store-admin)/discounts/page.tsx
@@ -78,13 +78,6 @@ const Page = () => {
       <Card my={10}>
         <CardBody>
           <Flex gap={4} pb={8}>
-            <Input
-              placeholder="Search..."
-              value={filters.keyword}
-              onChange={(e) =>
-                setFilters({ ...filters, keyword: e.target.value, page: 1 })
-              }
-            />
             <Input
               placeholder="Search..."
               value={filters.keyword}
@@ -169,7 +162,7 @@ const Page = () => {
                         <Button
                           colorScheme="blue"
                           onClick={() => {
-                            router.push(`/admin/stores/discounts`);
+                            router.push(`/admin/discounts/edit/${discount.id}`);
                           }}
                         >
                           Edit