(Online shop) seller administration, sale-items, order-review, order checkout & order status

context/AppContextProvider.tsx

@@ -10,9 +10,9 @@ import {
   useEffect
 } from 'react';
 import axiosClient, { setAuthToken } from '@/config/client';
+import { onIncompletePaymentFound } from '@/config/payment';
 import { AuthResult } from '@/constants/pi';
 import { IUser } from '@/constants/types';
-import { onIncompletePaymentFound } from '@/utils/auth';
 
 import logger from '../logger.config.mjs';
 
@@ -79,11 +79,15 @@ const AppContextProvider = ({ children }: AppContextProviderProps) => {
     if (typeof window !== 'undefined' && window.Pi?.initialized) {
       try {
         setIsSigningInUser(true);
-        const pioneerAuth: AuthResult = await window.Pi.authenticate(['username', 'payments'], onIncompletePaymentFound);
+        const pioneerAuth: AuthResult = await window.Pi.authenticate([
+          'username', 
+          'payments', 
+          'wallet_address'
+        ], onIncompletePaymentFound);
 
         // Send accessToken to backend
         const res = await axiosClient.post(
-          "/users/authenticate",
+          "/users/authenticate", 
           {}, // empty body
           {
             headers: {

messages/ar.json

@@ -14,6 +14,7 @@
     }
   },
   "SIDE_NAVIGATION": {
+    "VIEW_ORDERS_LABEL": "عرض الطلبات",
     "USER_PREFERENCES_HEADER": "تفضيلات المستخدم",
     "PERSONALIZATION_SUBHEADER": "التخصيص",
     "LANGUAGES": "اللغات",
@@ -43,7 +44,7 @@
   },
   "SCREEN": {
     "SELLER_REGISTRATION": {
-      "SELLER_REGISTRATION_HEADER": "تسجيل البائع",
+      "SELLER_REGISTRATION_HEADER": "إدارة البائع",
       "SELLER_DETAILS_LABEL": "تفاصيل البائع",
       "EMAIL_LABEL": "البريد الإلكتروني",
       "PHONE_NUMBER_LABEL": "رقم الهاتف",
@@ -67,7 +68,8 @@
       "SELLER_ADDRESS_LOCATION_PLACEHOLDER": "علامة الموقع على الخريطة تظهر مكان بيعي",
       "SELLER_SETTINGS_LABEL": "إعدادات البائع",
       "SELLER_SELL_CENTER": "تحديد مركز البيع",
-      "SELLER_ONLINE_SHOPPING_LABEL": "التسوق عبر الإنترنت",
+      "SELLER_ONLINE_SHOPPING_ITEMS_LIST_LABEL": "التسوق عبر الإنترنت | قائمة العناصر للبيع",
+      "SELLER_ONLINE_SHOPPING_ORDER_FULFILLMENT_LABEL": "التسوق عبر الإنترنت | تنفيذ الطلبات",
       "MAPPI_ALLOWANCE_LABEL": "المخصص المتبقي في Mappi",
       "FULFILLMENT_METHOD_TYPE": {
         "FULFILLMENT_METHOD_TYPE_LABEL": "طريقة الإتمام",
@@ -76,8 +78,9 @@
           "DELIVERED_TO_BUYER": "تسليم إلى المشتري"
         }
       },
-      "FULFILLMENT_INSTRUCTIONS_LABEL": "تعليمات التنفيذ للمشتري",
-      "FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "الدفع يكون من عنوان البائع. إذا تم اختيار التوصيل، يرجى إدخال عنوان المشتري.",
+      "SELLER_TO_BUYER_FULFILLMENT_INSTRUCTIONS_LABEL": "تعليمات التنفيذ للمشتري",
+      "SELLER_TO_BUYER_FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "الدفع يكون من عنوان البائع. إذا تم اختيار التوصيل، يرجى إدخال عنوان المشتري.",
+      "BUYER_TO_SELLER_FULFILLMENT_DETAILS_LABEL": "تفاصيل تنفيذ المشتري",
       "VALIDATION": {
         "EMAIL_VALIDATION": "يرجى إدخال بريد إلكتروني صالح",
         "SUCCESSFUL_REGISTRATION_SUBMISSION": "تم التسجيل بنجاح",
@@ -112,9 +115,35 @@
           "ONGOING_SERVICE": "خدمة مستمرة",
           "SOLD": "تم البيع"
         },
-        "SELLING_EXPIRATION_DATE": "يباع بتاريخ صلاحية {expired_by_date}"
+        "SELLING_EXPIRATION_DATE": "يباع بتاريخ صلاحية {expired_by_date}",
+        "VALIDATION": {
+          "REDUCED_DURATION_BELOW_SPENT_WEEKS": "لا يمكن تقليل مدة البيع إلى أقل من {spent_weeks} أسبوعًا تم قضاؤها بالفعل"
+        }
       }
     },
+    "SELLER_ORDER_FULFILLMENT": {
+      "ORDER_LIST_HEADER": "قائمة الطلبات",
+      "VIEW_ORDER_HEADER": "عرض الطلب",
+      "SELLER_ORDER_FULFILLMENT_HEADER": "إتمام طلب البائع",
+      "ORDER_HEADER_SUBHEADER": "رأس الطلب",
+      "ORDERED_ITEMS_SUBHEADER": "العناصر المطلوبة",
+      "ORDER_HEADER_ITEMS_FEATURE": {
+        "SELLER_LABEL": "البائع",
+        "TOTAL_PRICE_LABEL": "السعر الإجمالي",
+        "TIME_OF_ORDER_LABEL": "وقت الطلب",
+        "STATUS_LABEL": "الحالة"
+      },
+      "STATUS_TYPE": {
+        "INITIALIZED": "تم البدء",
+        "PENDING": "قيد الانتظار",
+        "COMPLETED": "مكتمل",
+        "CANCELED": "تم الإلغاء",
+        "REFUNDED": "تم استرداد المبلغ",
+        "FULFILLED": "تم التنفيذ"
+      },
+      "ORDER_COMPLETED_LABEL": "تم إكمال الطلب",
+      "ORDER_DISPATCHED_COLLECTED_LABEL": "تم شحن/استلام الطلب"
+    },
     "BUY_FROM_SELLER": {
       "BUY_FROM_SELLER_HEADER": "شراء من البائع",
       "SELLER_DETAILS_LABEL": "تفاصيل البائع",
@@ -127,7 +156,6 @@
       "REVIEWS_SCORE_MESSAGE": "درجة التقييمات: {seller_review_rating} من 5.0", 
       "SELLER_CONTACT_DETAILS_LABEL": "تفاصيل الاتصال بالبائع", 
       "SELLER_USERNAME_LABEL": "اسم المستخدم", 
-      "SELLER_PIONEER_ID_LABEL": "معرف المستخدم", 
       "SELLER_PHONE_NUMBER_LABEL": "رقم الهاتف", 
       "SELLER_EMAIL_ADDRESS_LABEL": "البريد الإلكتروني",
       "ONLINE_SHOPPING": {
@@ -171,7 +199,10 @@
         "LOADING_REVIEW_FAILURE": "خطأ في تحميل التقييم", 
         "SELF_REVIEW_NOT_POSSIBLE": "لا يمكن تقييم نفسك" 
       } 
-    } 
+    },
+    "VIEW_ORDER": {
+      "VIEW_ORDER_HEADER": "عرض الطلب"
+    }
   } ,
   "POPUP": {
     "MAP_MARKER": {
@@ -243,7 +274,13 @@
   },
   "SHARED": {
     "PIONEER_LABEL": "رائد",
+    "PIONEER_ID_LABEL": "معرف المستخدم", 
     "BUY": "شراء",
+    "RESET": "إعادة تعيين",
+    "REFUND": "استرداد",
+    "FULFILL": "تنفيذ",
+    "FULFILLED": "مكتمل",
+    "PENDING": "قيد الانتظار",
     "NAVIGATE": "تنقل",
     "NO_COMMENT": "لم يتم تقديم تعليق",
     "SEARCH_CENTER": "تعيين مركز البحث",
@@ -252,6 +289,7 @@
     "SEARCH_LOADING": "جارٍ تحميل البحث...",
     "REPLY": "رد",
     "ADD_ITEM": "إضافة منتج",
+    "CHECKOUT": "الدفع",
     "DELETE": "حذف",
     "CONFIRM_DELETE": "هل تريد حقًا حذف هذا المنتج؟ لا يمكن التراجع عن هذا الإجراء.",
     "SAVE": "حفظ",

messages/en-GB.json

@@ -14,6 +14,7 @@
     }
   },
   "SIDE_NAVIGATION": {
+    "VIEW_ORDERS_LABEL": "View Orders",
     "USER_PREFERENCES_HEADER": "User Preferences",
     "PERSONALIZATION_SUBHEADER": "Personalisation",
     "LANGUAGES": "Languages",
@@ -43,7 +44,7 @@
   },
   "SCREEN": {
     "SELLER_REGISTRATION": {
-      "SELLER_REGISTRATION_HEADER": "Seller Registration",
+      "SELLER_REGISTRATION_HEADER": "Seller Administration",
       "SELLER_DETAILS_LABEL": "Seller Details",
       "EMAIL_LABEL": "Email address",
       "PHONE_NUMBER_LABEL": "Phone number",
@@ -67,7 +68,8 @@
       "SELLER_ADDRESS_LOCATION_PLACEHOLDER": "My map marker shows where I am selling",
       "SELLER_SETTINGS_LABEL": "Seller Settings",
       "SELLER_SELL_CENTER": "Set Sell Centre",
-      "SELLER_ONLINE_SHOPPING_LABEL": "Online Shopping",
+      "SELLER_ONLINE_SHOPPING_ITEMS_LIST_LABEL": "Online Shopping | List Items for Sale",
+      "SELLER_ONLINE_SHOPPING_ORDER_FULFILLMENT_LABEL": "Online Shopping | Order Fulfilment",
       "MAPPI_ALLOWANCE_LABEL": "Mappi allowance remaining",
       "FULFILLMENT_METHOD_TYPE": {
         "FULFILLMENT_METHOD_TYPE_LABEL": "Fulfilment method",
@@ -76,8 +78,9 @@
           "DELIVERED_TO_BUYER": "Delivered to buyer"
         }
       },
-      "FULFILLMENT_INSTRUCTIONS_LABEL": "Fulfilment instructions to buyer",
-      "FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "Collection is from the seller's address. If delivery is selected, please enter the buyer's address.",
+      "SELLER_TO_BUYER_FULFILLMENT_INSTRUCTIONS_LABEL": "Seller fulfilment instructions to buyer",
+      "SELLER_TO_BUYER_FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "Collection is from the seller's address. If delivery is selected, please enter the buyer's address.",
+      "BUYER_TO_SELLER_FULFILLMENT_DETAILS_LABEL": "Buyer fulfilment details",
       "VALIDATION": {
         "EMAIL_VALIDATION": "Please enter a valid email address",
         "SUCCESSFUL_REGISTRATION_SUBMISSION": "Registration successful",
@@ -112,9 +115,35 @@
           "ONGOING_SERVICE": "Ongoing service",
           "SOLD": "Sold"  
         },
-        "SELLING_EXPIRATION_DATE": "Sell by {expired_by_date}"
+        "SELLING_EXPIRATION_DATE": "Sell by {expired_by_date}",
+        "VALIDATION": {
+          "REDUCED_DURATION_BELOW_SPENT_WEEKS": "Selling duration cannot be reduced below the {spent_weeks} weeks already spent"
+        }
       }
     },
+    "SELLER_ORDER_FULFILLMENT": {
+      "ORDER_LIST_HEADER": "Order List",
+      "VIEW_ORDER_HEADER": "View Order",
+      "SELLER_ORDER_FULFILLMENT_HEADER": "Seller Order Fulfilment",
+      "ORDER_SUBHEADER": "Order Header",
+      "ORDERED_ITEMS_SUBHEADER": "Ordered Items",
+      "ORDER_HEADER_ITEMS_FEATURE": {
+        "SELLER_LABEL": "Seller",
+        "TOTAL_PRICE_LABEL": "Total price",
+        "TIME_OF_ORDER_LABEL": "Time of order",
+        "STATUS_LABEL": "Status"
+      },
+      "STATUS_TYPE": {
+        "INITIALIZED": "Initiated",
+        "PENDING": "Pending",
+        "COMPLETED": "Completed",
+        "CANCELED": "Cancelled",
+        "REFUNDED": "Refunded",
+        "FULFILLED": "Fulfilled"
+      },
+      "ORDER_COMPLETED_LABEL": "Order Completed",
+      "ORDER_DISPATCHED_COLLECTED_LABEL": "Order Dispatched/Collected"
+    },
     "BUY_FROM_SELLER": {
       "BUY_FROM_SELLER_HEADER": "Buy from Seller",
       "SELLER_DETAILS_LABEL": "Seller Details",
@@ -126,8 +155,7 @@
       "REVIEWS_SUMMARY_LABEL": "Reviews Summary",
       "REVIEWS_SCORE_MESSAGE": "Reviews Score: {seller_review_rating} out of 5.0",
       "SELLER_CONTACT_DETAILS_LABEL": "Seller Contact Details",
-      "SELLER_USERNAME_LABEL": "Username",
-      "SELLER_PIONEER_ID_LABEL": "Pioneer ID", 
+      "SELLER_USERNAME_LABEL": "Username", 
       "SELLER_PHONE_NUMBER_LABEL": "Phone number",
       "SELLER_EMAIL_ADDRESS_LABEL": "Email address",
       "ONLINE_SHOPPING": {
@@ -171,6 +199,9 @@
         "LOADING_REVIEW_FAILURE": "Error loading review",
         "SELF_REVIEW_NOT_POSSIBLE": "Self-review is not possible"
       }
+    },
+    "VIEW_ORDER": {
+      "VIEW_ORDER_HEADER": "View Order"
     }
   },
   "POPUP": {
@@ -243,7 +274,13 @@
   },
   "SHARED": {
     "PIONEER_LABEL": "Pioneer",
+    "PIONEER_ID_LABEL": "Pioneer ID",
     "BUY": "Buy",
+    "RESET": "Reset",
+    "REFUND": "Refund",
+    "FULFILL": "Fulfil",
+    "FULFILLED": "Fulfilled",
+    "PENDING": "Pending",
     "NAVIGATE": "Navigate",
     "NO_COMMENT": "No comment provided",
     "SEARCH_CENTER": "Set Search Centre",
@@ -252,6 +289,7 @@
     "SEARCH_LOADING": "Search loading...",
     "REPLY": "Reply",
     "ADD_ITEM": "Add Item",
+    "CHECKOUT": "Checkout",
     "DELETE": "Delete",
     "CONFIRM_DELETE": "Do you really want to delete this item? This action cannot be undone.",
     "SAVE": "Save",

messages/en.json

@@ -14,6 +14,7 @@
     }
   },
   "SIDE_NAVIGATION": {
+    "VIEW_ORDERS_LABEL": "View Orders",
     "USER_PREFERENCES_HEADER": "User Preferences",
     "PERSONALIZATION_SUBHEADER": "Personalization",
     "LANGUAGES": "Languages",
@@ -43,7 +44,7 @@
   },
   "SCREEN": {
     "SELLER_REGISTRATION": {
-      "SELLER_REGISTRATION_HEADER": "Seller Registration",
+      "SELLER_REGISTRATION_HEADER": "Seller Administration",
       "SELLER_DETAILS_LABEL": "Seller Details",
       "EMAIL_LABEL": "Email address",
       "PHONE_NUMBER_LABEL": "Phone number",
@@ -67,7 +68,8 @@
       "SELLER_ADDRESS_LOCATION_PLACEHOLDER": "My map marker shows where I am selling",
       "SELLER_SETTINGS_LABEL": "Seller Settings",
       "SELLER_SELL_CENTER": "Set Sell Center",
-      "SELLER_ONLINE_SHOPPING_LABEL": "Online Shopping",
+      "SELLER_ONLINE_SHOPPING_ITEMS_LIST_LABEL": "Online Shopping | List Items for Sale",
+      "SELLER_ONLINE_SHOPPING_ORDER_FULFILLMENT_LABEL": "Online Shopping | Order Fulfillment",
       "MAPPI_ALLOWANCE_LABEL": "Mappi allowance remaining",
       "FULFILLMENT_METHOD_TYPE": {
         "FULFILLMENT_METHOD_TYPE_LABEL": "Fulfillment method",
@@ -76,8 +78,9 @@
           "DELIVERED_TO_BUYER": "Delivered to buyer"
         }
       },
-      "FULFILLMENT_INSTRUCTIONS_LABEL": "Fulfillment instructions to buyer",
-      "FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "Collection is from the seller's address. If delivery is selected, please enter the buyer's address.",
+      "SELLER_TO_BUYER_FULFILLMENT_INSTRUCTIONS_LABEL": "Seller fulfillment instructions to buyer",
+      "SELLER_TO_BUYER_FULFILLMENT_INSTRUCTIONS_PLACEHOLDER": "Collection is from the seller's address. If delivery is selected, please enter the buyer's address.",
+      "BUYER_TO_SELLER_FULFILLMENT_DETAILS_LABEL": "Buyer fulfillment details",
       "VALIDATION": {
         "EMAIL_VALIDATION": "Please enter a valid email address",
         "SUCCESSFUL_REGISTRATION_SUBMISSION": "Registration successful",
@@ -112,9 +115,35 @@
           "ONGOING_SERVICE": "Ongoing service",
           "SOLD": "Sold"  
         },
-        "SELLING_EXPIRATION_DATE": "Sell by {expired_by_date}"
+        "SELLING_EXPIRATION_DATE": "Sell by {expired_by_date}",
+        "VALIDATION": {
+          "REDUCED_DURATION_BELOW_SPENT_WEEKS": "Selling duration cannot be reduced below the {spent_weeks} weeks already spent"
+        }
       }
     },
+    "SELLER_ORDER_FULFILLMENT": {
+      "ORDER_LIST_HEADER": "Order List",
+      "VIEW_ORDER_HEADER": "View Order",
+      "SELLER_ORDER_FULFILLMENT_HEADER": "Seller Order Fulfillment",
+      "ORDER_SUBHEADER": "Order Header",
+      "ORDERED_ITEMS_SUBHEADER": "Ordered Items",
+      "ORDER_HEADER_ITEMS_FEATURE": {
+        "SELLER_LABEL": "Seller",
+        "TOTAL_PRICE_LABEL": "Total price",
+        "TIME_OF_ORDER_LABEL": "Time of order",
+        "STATUS_LABEL": "Status"
+      },
+      "STATUS_TYPE": {
+        "INITIALIZED": "Initialized",
+        "PENDING": "Pending",
+        "COMPLETED": "Completed",
+        "CANCELED": "Canceled",
+        "REFUNDED": "Refunded",
+        "FULFILLED": "Fulfilled"
+      },
+      "ORDER_COMPLETED_LABEL": "Order Completed",
+      "ORDER_DISPATCHED_COLLECTED_LABEL": "Order Dispatched/Collected"
+    },
     "BUY_FROM_SELLER": {
       "BUY_FROM_SELLER_HEADER": "Buy from Seller",
       "SELLER_DETAILS_LABEL": "Seller Details",
@@ -127,7 +156,6 @@
       "REVIEWS_SCORE_MESSAGE": "Reviews Score: {seller_review_rating} out of 5.0",
       "SELLER_CONTACT_DETAILS_LABEL": "Seller Contact Details",
       "SELLER_USERNAME_LABEL": "Username",
-      "SELLER_PIONEER_ID_LABEL": "Pioneer ID",
       "SELLER_PHONE_NUMBER_LABEL": "Phone number",
       "SELLER_EMAIL_ADDRESS_LABEL": "Email address",
       "ONLINE_SHOPPING": {
@@ -243,7 +271,13 @@
   },
   "SHARED": {
     "PIONEER_LABEL": "Pioneer",
+    "PIONEER_ID_LABEL": "Pioneer ID",
     "BUY": "Buy",
+    "RESET": "Reset",
+    "REFUND": "Refund",
+    "FULFILL": "Fulfill",
+    "FULFILLED": "Fulfilled",
+    "PENDING": "Pending",
     "NAVIGATE": "Navigate",
     "NO_COMMENT": "No comment provided",
     "SEARCH_CENTER": "Set Search Center",
@@ -252,6 +286,7 @@
     "SEARCH_LOADING": "Search loading...",
     "REPLY": "Reply",
     "ADD_ITEM": "Add Item",
+    "CHECKOUT": "Checkout",
     "DELETE": "Delete",
     "CONFIRM_DELETE": "Do you really want to delete this item? This action cannot be undone.",
     "SAVE": "Save",