[Front] ShopCount | Setting Tips - [Back] Stock Change

opentelekomcloud · Feb 7, 2024 · fa9d2e9 · fa9d2e9
1 parent cac538e
commit fa9d2e9
Show file tree

Hide file tree

Showing 9 changed files with 584 additions and 540 deletions.
diff --git a/TSystems.LoveOTC/AdminHub/Order/Export.cs b/TSystems.LoveOTC/AdminHub/Order/Export.cs
@@ -30,7 +30,7 @@ internal partial class AdminHub {
      * <remarks>
      * @author Aloento
      * @since 1.2.0
-     * @version 0.2.0
+     * @version 1.0.0
      * </remarks>
      */
     public async IAsyncEnumerable<byte[]> ExportOrder() {
@@ -224,16 +224,17 @@ public async IAsyncEnumerable<byte[]> ExportOrder() {
 
         int shared(string text) {
             var i = 0;
+            var table = sharedStringTablePart.SharedStringTable;
 
-            foreach (var item in sharedStringTablePart!.SharedStringTable.Elements<SharedStringItem>()) {
+            foreach (var item in table.Elements<SharedStringItem>()) {
                 if (item.InnerText == text)
                     return i;
 
                 i++;
             }
 
-            sharedStringTablePart.SharedStringTable.AppendChild(new SharedStringItem(new Text(text)));
-            sharedStringTablePart.SharedStringTable.Save();
+            table.AppendChild(new SharedStringItem(new Text(text)));
+            table.Save();
 
             return i;
         }

diff --git a/TSystems.LoveOTC/Hub/Order/Post.cs b/TSystems.LoveOTC/Hub/Order/Post.cs
@@ -13,7 +13,7 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.1.0
+     * @version 1.2.0
      * </remarks>
      */
     [Authorize]
@@ -39,19 +39,24 @@ await this.Db.Comments.AddAsync(new() {
             });
 
         foreach (var item in cart) {
-            if (item.Quantity > 3)
-                throw new HubException("No more than 3 of each type.");
+            if (item.Quantity is > Limit or < 1)
+                throw new HubException($"No more than {Limit} OR less 1 of each type.");
 
             var combo = await this.Db.Combos
-                .Where(x => x.IsArchived != true)
                 .Where(x => x.ProductId == item.ProdId)
+                .Where(x => x.IsArchived != true)
                 .Where(x => item.Type.All(
                     i => x.Types
                         .Select(t => t.Name)
-                        .Contains(i))
-                )
+                        .Contains(i)
+                    ))
                 .SingleAsync();
 
+            if (combo.Stock < item.Quantity)
+                throw new HubException("Insufficient Stock");
+
+            combo.Stock -= item.Quantity;
+
             await this.Db.OrderCombos.AddAsync(new() {
                 Order = order,
                 Combo = combo,
@@ -100,7 +105,7 @@ await this.Db.Comments.AddAsync(new() {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 1.1.0
+     * @version 1.2.0
      * </remarks>
      */
     [Authorize]
@@ -117,6 +122,8 @@ public async Task<bool> OrderPostCancel(uint orderId, string reason) {
             .Where(x => x.OrderId == orderId)
             .Where(x => x.Status != OrderStatus.Cancelled)
             .Where(x => x.Status != OrderStatus.Finished)
+            .Include(x => x.OrderCombos)
+            .ThenInclude(x => x.Combo)
             .SingleAsync();
 
         order.Status = order.Status == OrderStatus.Shipping
@@ -129,6 +136,9 @@ await this.Db.Comments.AddAsync(new() {
             Order = order
         });
 
+        foreach (var oc in order.OrderCombos)
+            oc.Combo.Stock += oc.Quantity;
+
         return await this.Db.SaveChangesAsync() > 0;
     }
 

diff --git a/TSystems.LoveOTC/Hub/Product/Get.cs b/TSystems.LoveOTC/Hub/Product/Get.cs
@@ -3,14 +3,16 @@ namespace TSystems.LoveOTC.Hub;
 using Microsoft.EntityFrameworkCore;
 
 internal partial class ShopHub {
+    protected const byte Limit = 3;
+
     /**
      * <remarks>
      * @author Aloento
      * @since 0.1.0
      * @version 0.2.0
      * </remarks>
      */
-    public Task<byte> ProdGetLimit(uint _) => Task.FromResult<byte>(3);
+    public Task<byte> ProdGetLimit(uint _) => Task.FromResult(Limit);
 
     /**
      * <remarks>

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "update": "npx npm-check-updates -u"
   },
   "dependencies": {
-    "@fluentui/react-components": "^9.46.3",
+    "@fluentui/react-components": "^9.46.4",
     "@fluentui/react-hooks": "^8.6.36",
     "@fluentui/react-icons": "^2.0.226",
     "@griffel/react": "^1.5.20",
@@ -52,8 +52,8 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "@types/react": "^18.2.54",
-    "@types/react-dom": "^18.2.18",
+    "@types/react": "^18.2.55",
+    "@types/react-dom": "^18.2.19",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "typescript": "^5.3.3",
     "vite": "^5.0.12"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/Components/Setting.tsx b/src/Components/Setting.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, DialogActions, DialogBody, DialogContent, DialogSurface, DialogTitle, DialogTrigger, Field, Input, Label, Toast, ToastBody, ToastTitle, makeStyles, tokens } from "@fluentui/react-components";
+import { Button, Dialog, DialogActions, DialogBody, DialogContent, DialogSurface, DialogTitle, DialogTrigger, Field, Input, Label, Toast, ToastBody, ToastTitle, Tooltip, makeStyles, tokens } from "@fluentui/react-components";
 import { useEffect, useState } from "react";
 import { useAuth } from "react-oidc-context";
 import { Logger } from "~/Helpers/Logger";
@@ -39,7 +39,7 @@ const log = new Logger("Setting");
 /**
  * @author Aloento
  * @since 0.1.0
- * @version 0.5.0
+ * @version 0.7.0
  */
 export function Setting({ Open, Toggle, New }: ISetting) {
   const style = useStyles();
@@ -105,22 +105,40 @@ export function Setting({ Open, Toggle, New }: ISetting) {
 
           <DialogContent className={style.box}>
             <div className={style.one}>
-              <Field label="Name" size="large" required>
-                <Input size="medium" value={name} maxLength={20} onChange={(_, v) => setName(v.value)} />
-              </Field>
-
-              <Field label="Phone" size="large" required>
-                <Input size="medium" value={phone} maxLength={20} onChange={(_, v) => setPhone(v.value)} />
-              </Field>
+              <Tooltip
+                content="Full first and family names, will be used to the shipping label."
+                relationship="description"
+                withArrow
+              >
+                <Field label="Name" size="large" required>
+                  <Input size="medium" value={name} maxLength={20} onChange={(_, v) => setName(v.value)} />
+                </Field>
+              </Tooltip>
+
+              <Tooltip
+                content="Up to 20 digits, starting with an internation access code."
+                relationship="description"
+                withArrow
+              >
+                <Field label="Phone" size="large" required>
+                  <Input size="medium" value={phone} maxLength={20} onChange={(_, v) => setPhone(v.value)} />
+                </Field>
+              </Tooltip>
             </div>
 
             <Field label="E-Mail" size="large">
               <Label>{auth.user?.profile.email}</Label>
             </Field>
 
-            <Field label="Address" size="large" required>
-              <Input size="medium" value={address} maxLength={100} minLength={20} onChange={(_, v) => setAddress(v.value)} />
-            </Field>
+            <Tooltip
+              content="Your full shipping address including street, number, ZIP, town and country. Separate lines by commas."
+              relationship="description"
+              withArrow
+            >
+              <Field label="Address" size="large" required>
+                <Input size="medium" value={address} maxLength={100} minLength={20} onChange={(_, v) => setAddress(v.value)} />
+              </Field>
+            </Tooltip>
           </DialogContent>
 
           <DialogActions>

diff --git a/src/Components/ShopCart/Columns.tsx b/src/Components/ShopCart/Columns.tsx
@@ -56,10 +56,15 @@ const columns: TableColumnDefinition<ICartItem>[] = [
             max={max}
             value={item.Quantity}
             onChange={(_, v) => {
-              if (dis && v.value! >= item.Quantity)
+              if (dis)
                 return;
 
-              item.Quantity = v.value!;
+              const val = v.value || parseInt(v.displayValue!);
+
+              if ((!v.value && isNaN(val)) || val < 1 || val > max || val === item.Quantity)
+                return;
+
+              item.Quantity = val;
               Update(List);
             }} />
         </DataGridCell>
@@ -86,7 +91,7 @@ const columns: TableColumnDefinition<ICartItem>[] = [
 /**
  * @author Aloento
  * @since 0.1.0
- * @version 0.3.1
+ * @version 0.4.0
  */
 export function CartColumns(log: Logger): TableColumnDefinition<ICartItem>[] {
   return [

diff --git a/src/Pages/Product/Quantity.tsx b/src/Pages/Product/Quantity.tsx
@@ -32,7 +32,7 @@ const useStyles = makeStyles({
 /**
  * @author Aloento
  * @since 1.2.0
- * @version 0.2.0
+ * @version 0.3.0
  */
 export function ProductQuantity({ Id }: { Id: number; }) {
   const style = useStyles();
@@ -61,7 +61,14 @@ export function ProductQuantity({ Id }: { Id: number; }) {
           min={1}
           max={max}
           disabled={!Combo?.Stock}
-          onChange={(_, val) => setQuantity(val.value!)}
+          onChange={(_, v) => {
+            const val = v.value || parseInt(v.displayValue!);
+
+            if ((!v.value && isNaN(val)) || val < 1 || val > max || val === quantity)
+              return;
+
+            setQuantity(val);
+          }}
         />
 
         <ProductAddCart

diff --git a/src/index.tsx b/src/index.tsx
@@ -37,7 +37,7 @@ theme.fontFamilyMonospace = `TeleNeoWeb, ${theme.fontFamilyMonospace}`;
 theme.fontFamilyNumeric = `TeleNeoWeb, ${theme.fontFamilyNumeric}`;
 
 const log = new Logger("LoveOTC");
-log.info("Version: 1.3.5 2024/02/05");
+log.info("Version: 1.3.5 2024/02/07");
 log.debug("T-Systems, EcoSystem Squad, Aloento");
 
 /**