@ozdao/martyrs 0.2.508 → 0.2.510

package/src/modules/inventory/components/pages/Inventory.vue

@@ -18,133 +18,138 @@
     </header>
 
     <!-- Products Feed -->
-    <Feed
-      :search="true"
-      v-model:filter="filter"
-      v-model:sort="sort"
-      :store="{
-        read: (options) => products.actions.read(options),
-        state: products.state
-      }"
-      :actions="[{
-        key: 'settings',
-        component: IconSettings,
-        props: {
-          class: 'h-3r pd-r-small pd-l-small flex-center flex bg-light t-black radius-small hover-scale-1 cursor-pointer'
-        },
-        handler: openViewSettings
-      }]"
-      :options="{
-        limit: 15,
-        lookup: ['inventory','categories'],
-        owner: route.params._id,
-        sortParam: sort.param,
-        sortOrder: sort.order
-      }"
-      v-slot="{ items }"
-    >
-      <Table
-        :columns="columns.filter(col => col.visible)"
-        :items="items"
-        class="bg-white z-index-1 br-solid br-1px br-light radius-medium"
+    <div class="rows-1">
+      <Feed
+        :search="true"
+        v-model:filter="filter"
+        v-model:sort="sort"
+        :store="{
+          read: (options) => products.actions.read(options),
+          state: products.state
+        }"
+        :actions="[{
+          key: 'settings',
+          component: IconSettings,
+          props: {
+            class: 'h-3r pd-r-small pd-l-small flex-center flex bg-light t-black radius-small hover-scale-1 cursor-pointer'
+          },
+          handler: openViewSettings
+        }]"
+        :options="{
+          limit: 15,
+          lookup: ['inventory','categories'],
+          owner: route.params._id,
+          sortParam: sort.param,
+          sortOrder: sort.order
+        }"
+        v-slot="{ items }"
       >
-        <!-- Name column (was "product") -->
-        <template #cell-name="{ row }">
-          <div class="flex gap-small flex-nowrap flex-v-center">
-            <img
-              v-if="row.images?.length"
-              :src="(FILE_SERVER_URL || '') + row.images[0]"
-              alt="Product"
-              class="w-3r h-3r radius-small bg-light object-fit-cover"
-            />
-            <PlaceholderImage v-else class="w-3r h-3r radius-small" />
-            <span class="t-nowrap">{{ row.name || 'Unknown Product' }}</span>
-          </div>
-        </template>
-
-        <!-- Categories -->
-        <template #cell-category="{ row }">
-          <span
-            v-if="row.category?.length"
-            v-for="cat in row.category"
-            :key="cat._id"
-            class="pd-nano mn-r-micro pd-r-small pd-l-small radius-small bg-light t-small"
-          >
-            {{ cat.name }}
-          </span>
-          <span v-else>-</span>
-        </template>
+        <Table
+          :columns="columns.filter(col => col.visible)"
+          :items="items"
+          class="bg-white z-index-1 br-solid br-1px br-light radius-medium"
+        >
+          <!-- Name column (was "product") -->
+          <template #cell-name="{ row }">
+            <div class="w-max-20r t-trim flex gap-small flex-nowrap flex-v-center">
+              <img
+                v-if="row.images?.length"
+                :src="(FILE_SERVER_URL || '') + row.images[0]"
+                alt="Product"
+                class="w-3r h-3r radius-small bg-light object-fit-cover"
+              />
+              <PlaceholderImage v-else class="w-3r h-3r radius-small" />
+              <p class="t-trim t-nowrap">{{ row.name || 'Unknown Product' }}</p>
+            </div>
+          </template>
 
-        <!-- Storages -->
-        <template #cell-storages="{ row }">
-          <div v-if="row.availabilityDetails?.length" class="flex flex-column gap-micro">
-            <div 
-              v-for="avail in row.availabilityDetails" 
-              :key="avail._id"
-              class="flex gap-small flex-v-center"
-            >
-              <span class="t-small">{{ avail.storageName || avail.storage }}:</span>
-              <span class="t-medium">{{ avail.available || 0 }}</span>
+          <!-- Categories -->
+          <template #cell-category="{ row }">
+            <div class="w-max-10r flex-nowrap flex  t-trim">
+              <p
+                v-if="row.category?.length"
+                v-for="cat in row.category"
+                :key="cat._id"
+                class="w-max t-trim pd-small mn-r-micro radius-small bg-light t-small"
+              >
+                {{ cat.name }}
+              </p>
+              <p v-else>-</p>
             </div>
-          </div>
-          <span v-else class="t-transp">No stock</span>
-        </template>
+          </template>
 
-        <!-- Available (replaces stock) -->
-        <template #cell-available="{ row }">
-          <div class="flex-column flex">
-            <span class="d-block mn-b-thin">
-              {{ row.available }} ·
-              {{ row.available <= 5 ? 'Low' : row.available <= 10 ? 'Medium' : 'High' }}
-            </span>
-            <div class="w-100 h-micro radius-thin bg-light">
-              <div
-                class="h-100 radius-thin"
-                :class="
-                  row.available <= 1
-                    ? 'bg-red t-white'
-                    : row.available <= 2
-                    ? 'bg-orange t-white'
-                    : 'bg-green t-white'
-                "
-                :style="`width: ${
-                  Math.min(
-                    (row.available / (row.alert !== undefined ? row.alert : 50)) * 100,
-                    100
-                  )
-                }%`"
-              />
+          <!-- Storages -->
+          <template #cell-storages="{ row }">
+            <div class="w-max-10r flex-nowrap flex  t-trim">
+              <p
+                v-if="row.availabilityDetails?.length"
+                v-for="avail in row.availabilityDetails" 
+                :key="avail._id"
+                class="w-max t-trim pd-small mn-r-micro radius-small bg-light t-small"
+              >
+
+                <span class="t-medium">{{ avail.available || 0 }}</span> ·  
+                <span class="t-small">{{ avail.storageName || avail.storage }}:</span>
+              </p>
+              <p v-else>No stock</p>
             </div>
-          </div>
-        </template>
-        <!-- Price -->
-        <template #cell-price="{ row }">
-          {{ formatPrice(row.price || 0) }}
-        </template>
+          </template>
 
-        <!-- Actions -->
-        <template #cell-actions="{ row }">
-          <Dropdown
-            :label="{ component: IconEllipsis, class: 't-transp i-medium' }"
-            class="cursor-pointer aspect-1x1 pd-nano radius-small hover-bg-light"
-            align="right"
-          >
-            <div class="bg-white radius-small">
-              <button @click="openStockAudit(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
-                Audit Stock
-              </button>
-              <button @click="openStockHistory(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
-                Stock History
-              </button>
-              <button @click="openReorderSettings(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
-                Set Alerts
-              </button>
+          <!-- Available (replaces stock) -->
+          <template #cell-available="{ row }">
+            <div class="flex-column flex">
+              <span class="d-block mn-b-thin">
+                {{ row.available }} ·
+                {{ row.available <= 5 ? 'Low' : row.available <= 10 ? 'Medium' : 'High' }}
+              </span>
+              <div class="w-100 h-micro radius-thin bg-light">
+                <div
+                  class="h-100 radius-thin"
+                  :class="
+                    row.available <= 1
+                      ? 'bg-red t-white'
+                      : row.available <= 2
+                      ? 'bg-orange t-white'
+                      : 'bg-green t-white'
+                  "
+                  :style="`width: ${
+                    Math.min(
+                      (row.available / (row.alert !== undefined ? row.alert : 50)) * 100,
+                      100
+                    )
+                  }%`"
+                />
+              </div>
             </div>
-          </Dropdown>
-        </template>
-      </Table>
-    </Feed>
+          </template>
+          <!-- Price -->
+          <template #cell-price="{ row }">
+            {{ formatPrice(row.price || 0) }}
+          </template>
 
+          <!-- Actions -->
+          <template #cell-actions="{ row }">
+            <Dropdown
+              :label="{ component: IconEllipsis, class: 't-transp i-medium' }"
+              class="cursor-pointer aspect-1x1 pd-nano radius-small hover-bg-light"
+              align="right"
+            >
+              <div class="bg-white radius-small">
+                <button @click="openStockAudit(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+                  Audit Stock
+                </button>
+                <button @click="openStockHistory(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+                  Stock History
+                </button>
+                <button @click="openReorderSettings(row)" class="cursor-pointer t-left t-nowrap w-100 pd-small">
+                  Set Alerts
+                </button>
+              </div>
+            </Dropdown>
+          </template>
+        </Table>
+      </Feed>
+    </div>
     <!-- Modals -->
     <Popup
       :isPopupOpen="showAuditModal"
@@ -210,6 +215,8 @@ import Feed from '@martyrs/src/components/Feed/Feed.vue'
 import PlaceholderImage from '@martyrs/src/modules/icons/placeholders/PlaceholderImage.vue'
 import Dropdown from '@martyrs/src/components/Dropdown/Dropdown.vue'
 import Popup from '@martyrs/src/components/Popup/Popup.vue'
+import Chips  from '@martyrs/src/components/Chips/Chips.vue'
+
 
 // Icons
 import IconSettings from '@martyrs/src/modules/icons/entities/IconSettings.vue'

package/src/modules/orders/components/forms/FormCustomerDetails.vue

@@ -63,6 +63,48 @@
       class="bg-white pd-small radius-small mn-b-thin"
     />
 
+    <!-- Address Fields -->
+    <div class="mn-t-small">
+      <h3 class="t-medium mn-b-thin">Address Information</h3>
+      
+      <Field 
+        v-model:field="customer.address.country"   
+        label="Country"  
+        placeholder="Enter country"  
+        class="bg-white pd-small radius-small mn-b-thin"
+      />
+      
+      <Field 
+        v-model:field="customer.address.addressLine1"   
+        label="Address Line 1"  
+        placeholder="Enter address line 1"  
+        class="bg-white pd-small radius-small mn-b-thin"
+        required
+      />
+      
+      <Field 
+        v-model:field="customer.address.addressLine2"   
+        label="Address Line 2"  
+        placeholder="Enter address line 2"  
+        class="bg-white pd-small radius-small mn-b-thin"
+      />
+      
+      <div class="gap-thin flex-justify-between flex-nowrap flex">
+        <Field 
+          v-model:field="customer.address.city"   
+          label="City"  
+          placeholder="Enter city"  
+          class="bg-white pd-small radius-small w-100"
+        />
+        <Field 
+          v-model:field="customer.address.postalCode"   
+          label="Postal Code"  
+          placeholder="Enter postal code"  
+          class="bg-white pd-small radius-small w-100"
+        />
+      </div>
+    </div>
+
     <Select 
       :select="statusSelected"
       :options="[
@@ -152,6 +194,15 @@ watch(customer, (newCustomer) => {
     if (!newCustomer.socials) {
       newCustomer.socials = { instagram: null, telegram: null, whatsapp: null };
     }
+    if (!newCustomer.address) {
+      newCustomer.address = { 
+        country: null, 
+        addressLine1: null, 
+        addressLine2: null, 
+        city: null, 
+        postalCode: null 
+      };
+    }
   }
 }, { immediate: true, deep: true });
 

package/src/modules/orders/middlewares/customers.verifier.js

@@ -94,6 +94,36 @@ export default (function (db) {
         type: Validator.schema().string().oneOf(['user', 'organization', 'User', 'Organization']),
         target: Validator.schema().string().pattern(/^[0-9a-fA-F]{24}$/)
       })
+    },
+    'address.country': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(100, 'Country must not exceed 100 characters')
+    },
+    'address.addressLine1': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(255, 'Address line 1 must not exceed 255 characters')
+    },
+    'address.addressLine2': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(255, 'Address line 2 must not exceed 255 characters')
+    },
+    'address.city': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(100, 'City must not exceed 100 characters')
+    },
+    'address.postalCode': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(20, 'Postal code must not exceed 20 characters')
     }
   });
 
@@ -174,6 +204,36 @@ export default (function (db) {
       validator: Validator.schema()
         .string()
         .oneOf(['active', 'inactive', 'blocked'])
+    },
+    'address.country': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(100, 'Country must not exceed 100 characters')
+    },
+    'address.addressLine1': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(255, 'Address line 1 must not exceed 255 characters')
+    },
+    'address.addressLine2': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(255, 'Address line 2 must not exceed 255 characters')
+    },
+    'address.city': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(100, 'City must not exceed 100 characters')
+    },
+    'address.postalCode': {
+      rule: 'optional',
+      validator: Validator.schema()
+        .string()
+        .max(20, 'Postal code must not exceed 20 characters')
     }
   });
 

package/src/modules/orders/models/customer.model.js

@@ -45,6 +45,24 @@ export default db => {
         enum: ['active', 'inactive', 'blocked'],
         default: 'active',
       },
+      address: {
+        country: {
+          type: String,
+        },
+        addressLine1: {
+          type: String,
+          required: true,
+        },
+        addressLine2: {
+          type: String,
+        },
+        city: {
+          type: String,
+        },
+        postalCode: {
+          type: String,
+        },
+      },
     },
     {
       timestamps: {

package/src/modules/orders/orders.client.js

@@ -91,7 +91,6 @@ function initializeOrders(app, store, router, options = {}) {
 
   // Organization routes
   if (!options.withOrganizationRoutes) {
-    console.log('Adding organization routes, parentName:', routeOrganizations);
     addRoutes(router, {
       parentName: routeOrganizations,
       basePath: 'orders', // Промежуточный маршрут /organization/orders
@@ -104,11 +103,6 @@ function initializeOrders(app, store, router, options = {}) {
         context: 'organization',
       },
     });
-    console.log('Router routes after adding organization orders:', router.getRoutes().map(r => r.name));
-    const orgOrdersList = router.getRoutes().find(r => r.name === 'OrganizationOrdersList');
-    console.log('OrganizationOrdersList route details:', orgOrdersList);
-    console.log('Route params:', orgOrdersList?.params);
-    console.log('Route keys:', orgOrdersList?.keys);
   }
 
   // Customer routes for backoffice
@@ -184,44 +178,42 @@ function initializeOrders(app, store, router, options = {}) {
 
 const ModuleOrder = {
   initialize: initializeOrders,
-  views: {
-    store: {
-      storeOrders,
-      storeShopcart,
-      storeTestimonials,
-      storeCustomers,
-      storeApplications,
-    },
-    router: {
-      routerOrders,
-      routerCustomers,
-      routerApplications,
-    },
-    components: {
-      // Pages
-      Orders,
-      Customers,
-      Applications,
-      // Order,
-      OrderCreate,
-      OrderCreateBackoffice,
-      // Favorites,
-      // Blocks
-      CardOrderItem,
-      CardOrder,
-      CardOrderUser,
-      CardCustomer,
-      StatusHistory,
-      // Sections
-      FormCustomerDetails,
-      AskToLogin,
-      FormDelivery,
-      EmptyState,
-      Succes,
-      FormPayment,
-      // Partials
-      ShopCart,
-    },
+  store: {
+    storeOrders,
+    storeShopcart,
+    storeTestimonials,
+    storeCustomers,
+    storeApplications,
+  },
+  router: {
+    routerOrders,
+    routerCustomers,
+    routerApplications,
+  },
+  components: {
+    // Pages
+    Orders,
+    Customers,
+    Applications,
+    // Order,
+    OrderCreate,
+    OrderCreateBackoffice,
+    // Favorites,
+    // Blocks
+    CardOrderItem,
+    CardOrder,
+    CardOrderUser,
+    CardCustomer,
+    StatusHistory,
+    // Sections
+    FormCustomerDetails,
+    AskToLogin,
+    FormDelivery,
+    EmptyState,
+    Succes,
+    FormPayment,
+    // Partials
+    ShopCart,
   },
 };
 

package/src/modules/orders/store/models/customer.js

@@ -36,6 +36,13 @@ const customerInitState = {
     telegram: null,
     whatsapp: null,
   },
+  address: {
+    country: null,
+    addressLine1: null,
+    addressLine2: null,
+    city: null,
+    postalCode: null,
+  },
 };
 
 export default customerInitState;

package/src/modules/organizations/configs/navigation.organization.config.js

@@ -110,7 +110,13 @@ export const navigationItems = [
   },
   {
     category: 'Management',
-    visible: (auth, route) => auth.state && auth.state.user && auth.state.user._id, // Only for authenticated users
+    visible: (auth, route) => hasAccess(
+      route.params._id, 
+      'products', 
+      'read', 
+      auth.accesses, 
+      auth.access.roles
+    ),
     items: [
       {
         title: 'Categories',
@@ -161,7 +167,13 @@ export const navigationItems = [
   },
   {
     category: 'Orders & Sales',
-    visible: (auth, route) => auth.state && auth.state.user && auth.state.user._id, // Only for authenticated users
+    visible: (auth, route) => hasAccess(
+      route.params._id, 
+      'orders', 
+      'read', 
+      auth.accesses, 
+      auth.access.roles
+    ),
     items: [
       {
         title: 'Orders',
@@ -169,14 +181,7 @@ export const navigationItems = [
         route: (auth, route) => ({
           name: 'OrganizationOrdersList',
           params: { _id: route.params._id }
-        }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'orders', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        })
       },
       {
         title: 'Customers',
@@ -184,14 +189,7 @@ export const navigationItems = [
         route: (auth, route) => ({
           name: 'OrganizationCustomers',
           params: { _id: route.params._id }
-        }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'orders', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        })
       },
       {
         title: 'Applications',
@@ -199,14 +197,7 @@ export const navigationItems = [
         route: (auth, route) => ({
           name: 'OrganizationApplications',
           params: { _id: route.params._id }
-        }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'orders', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        })
       },
     ]
   },