@things-factory/operato-mms 4.0.0-alpha.7 → 4.0.0-beta.1

package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts

@@ -1,39 +1,107 @@
+import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
 import { FulfillmentAPI } from '@things-factory/integration-fulfillment'
+import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
 import { Domain } from '@things-factory/shell'
-import { MarketplaceOrder } from '@things-factory/marketplace-base'
-import { Bizplace, getCustomerBizplaces } from '@things-factory/biz-base'
-import { EntityManager, SelectQueryBuilder, createQueryBuilder } from 'typeorm'
 
 export const autoAddReleaseOrderResolver = {
   async autoAddReleaseOrder(_: void, { warehouseId }: { warehouseId: string }, context: any): Promise<void> {
-    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+    const { domain }: { domain: Domain } = context.state
 
     const qb: SelectQueryBuilder<MarketplaceOrder> = createQueryBuilder(MarketplaceOrder, 'MO')
     const marketplaceOrders: MarketplaceOrder[] = await qb
       .leftJoinAndSelect('MO.marketplaceOrderItems', 'MOI')
+      .leftJoinAndSelect('MOI.marketplaceOrderShipping', 'MOS')
       .leftJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
+      .leftJoinAndSelect('MO.marketplaceStore', 'MPS')
       .where('MO.domain = :domainId', { domainId: domain.id })
       .andWhere('MO.releaseOrderId IS NULL')
-      .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled'] })
+      .andWhere('MO.status IN (:...status)', { status: ['ready_to_ship', 'unfulfilled', 'packed'] })
+      .andWhere('MPS.status = :marketplaceStatus', { marketplaceStatus: 'ACTIVE' })
       .getMany()
 
     var fulfilmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
     var centerId: string = fulfilmentCenter.centerId
 
-    var warehouseDomain: Domain = await tx.getRepository(Domain).findOne({ where: { subdomain: centerId } })
+    var warehouseDomain: Domain = await getRepository(Domain).findOne({ where: { subdomain: centerId } })
     var customerBizplaces: Bizplace[] = await getCustomerBizplaces(warehouseDomain)
-    var customerBizplaceId: string = customerBizplaces[0].id
+    const customerBizplaceId: string = customerBizplaces.find(
+      customerBizplace => customerBizplace.company.domain.id === domain.id
+    ).id
 
     for (var i = 0; i < marketplaceOrders.length; i++) {
       const marketplaceOrder = marketplaceOrders[i]
 
-      var releaseOrder: any = await FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
-        customerBizplaceId,
-        marketplaceOrder
+      const marketplaceOrderShippings: MarketplaceOrderShipping[] = await getRepository(MarketplaceOrderShipping).find({
+        where: { orderNoRef: marketplaceOrder.orderNo, domain }
       })
 
+      for (var j = 0; j < marketplaceOrderShippings.length; j++) {
+        const marketplaceOrderShipping: MarketplaceOrderShipping = marketplaceOrderShippings[j]
+
+        const date: Date = new Date()
+        const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
+          .toString()
+          .padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`
+
+        const newMarketplaceOrder: any = {
+          releaseDate,
+          type: 'b2c',
+          transporter: marketplaceOrder.shippingProvider,
+          trackingNo: marketplaceOrderShipping?.ownTrackingNo
+            ? marketplaceOrderShipping.ownTrackingNo
+            : marketplaceOrderShipping.trackingNo,
+          packingOption: true,
+          exportOption: false,
+          ownTransport: true,
+          courierOption: true,
+          collectionOrderNo: marketplaceOrder.orderNo,
+          refNo: marketplaceOrder.orderNo,
+          refNo2: marketplaceOrder.orderNo + ' - ' + (j + 1) + '/' + marketplaceOrderShippings.length,
+          deliverTo: {
+            deliveryAddress1: marketplaceOrderShipping.address1,
+            deliveryAddress2: marketplaceOrderShipping.address2,
+            deliveryAddress3: marketplaceOrderShipping.address3,
+            deliveryAddress4: marketplaceOrderShipping.address4,
+            deliveryAddress5: marketplaceOrderShipping.address5,
+            attentionTo: marketplaceOrderShipping.attentionTo,
+            city: marketplaceOrderShipping.city,
+            postalCode: marketplaceOrderShipping.postCode,
+            country: marketplaceOrderShipping.country,
+            state: marketplaceOrderShipping.state,
+            phone1: marketplaceOrderShipping.phone1,
+            phone2: marketplaceOrderShipping?.phone2 ? marketplaceOrderShipping.phone2 : null
+          },
+          marketplaceOrderStatus: marketplaceOrder.status,
+          airwayBill: marketplaceOrderShipping?.airwayBill ? marketplaceOrderShipping.airwayBill : null,
+          invoice: marketplaceOrderShipping?.invoice ? marketplaceOrderShipping.invoice : null,
+          orderInventories: marketplaceOrder.marketplaceOrderItems
+            .filter(item => {
+              if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
+                return item
+              }
+            })
+            .map((orderItem: any) => {
+              const { marketplaceProductVariation: productVariation }: any = orderItem
+              return {
+                product: {
+                  sku: productVariation.sku
+                },
+                releaseQty: orderItem.qty
+              }
+            })
+        }
+
+        var releaseOrder: any = await FulfillmentAPI.createOutboundOrder(fulfilmentCenter, {
+          customerBizplaceId,
+          releaseOrder: newMarketplaceOrder
+        })
+      }
+
       marketplaceOrder.releaseOrderId = releaseOrder.id
-      await tx.getRepository(MarketplaceOrder).save(marketplaceOrder)
+      marketplaceOrder.fulfillmentCenter = fulfilmentCenter
+      await getRepository(MarketplaceOrder).save(marketplaceOrder)
     }
   }
 }

package/server/graphql/resolvers/interface-with-hub/warehouse-marketplace-products.ts

@@ -38,6 +38,33 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
       OR Lower("Product"."description") LIKE '${productInfo.value.toLowerCase()}')`
   }
 
+  await tx.query(`
+    CREATE TEMP TABLE "temp_products" AS (
+      SELECT * FROM (
+        SELECT "Product"."id" AS "product_id", "Product"."sku" AS "product_sku", "Product"."name" AS "product_name", 
+        "Product"."description" AS "product_description", "Product"."creator_id", "Product"."updater_id", 
+        "Product"."bizplace_id" AS "product_bizplace_id", 'PRODUCT' AS "type" 
+        FROM products "Product" 
+        WHERE 1=1
+        AND "Product"."deleted_at" IS NULL 
+        AND "Product"."bizplace_id" IN (${bizplaceIds})
+        ${productQuery}
+      ) d1
+      UNION ALL
+      SELECT * FROM
+      (
+        SELECT "Product"."id" AS "product_id", "Product"."sku" AS "product_sku", "Product"."name" AS "product_name",
+        "Product"."description" AS "product_description", "Product"."creator_id", "Product"."updater_id", 
+        "Product"."bizplace_id" AS "product_bizplace_id", 'BUNDLE' AS "type" 
+        FROM product_bundles "Product" 
+        WHERE 1 = 1
+        AND "Product"."status" = 'ACTIVATED'
+        AND "Product"."bizplace_id" IN (${bizplaceIds})
+        ${productQuery}
+      ) d2
+    )
+  `)
+
   await tx.query(`
     CREATE TEMP TABLE "temp_json_warehouse_marketplace_products" AS (
       select "product_id", array_to_json(array_agg(row_to_json(dt))) AS "Json_marketplaceProducts" FROM (
@@ -45,13 +72,10 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
         from (
             select "mp"."marketplace_store_id" as "marketplace_store_id", "mpv"."sku", "mpv"."id" as "marketplace_product_variation_id",
             concat("mpv"."variation_sku", ' (', "mpv"."name", ')') as "name", "mpv"."qty" as "qty",
-            "Product"."id" AS "product_id"
+            "Product"."product_id" AS "product_id"
             from marketplace_product_variations "mpv"
             inner join marketplace_products "mp" on "mp"."id" = "mpv"."marketplace_product_id"
-            inner join products "Product" on "mpv"."sku" = "Product"."sku"
-            where "Product"."bizplace_id" IN (${bizplaceIds})
-            and "mpv"."sku" is not null
-            ${productQuery}
+            inner join temp_products "Product" on "mpv"."sku" = "Product"."product_sku"
         ) as "dt"
         group by "dt"."marketplace_store_id", "dt"."sku", "dt"."product_id"
       ) "dt" group by "dt"."product_id"
@@ -67,9 +91,18 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
         inner join warehouses "w" on "w"."id" = "i2"."warehouse_id" 
         inner join domains "d2" on "d2"."id" = "w"."domain_id" and "d2"."ext_type" ='warehouse'
         inner join fulfillment_centers "fc" ON "fc"."center_id" = "d2"."subdomain" 
-        inner join products "Product" on "Product"."id" = "i2"."product_id"
-        where "Product"."bizplace_id" IN (${bizplaceIds})
-        ${productQuery}
+        inner join temp_products "Product" on "Product"."product_id" = "i2"."product_id" AND "Product"."type" = 'PRODUCT'
+        group by "fc"."id", "fc"."name", "i2"."product_id"
+        UNION
+        select "fc"."id" as "fulfillment_id", "fc"."name" as "fulfillment_name",
+        "i2"."product_id", max(CEILING(COALESCE(i2.locked_qty,0))) AS "locked_qty", min(floor(i2.qty/pbs.bundle_qty)) AS "inventory_qty"
+        from temp_products "Product" 
+        inner join product_bundle_settings pbs ON pbs.product_bundle_id = "Product"."product_id"
+        inner join inventories i2 ON i2.product_id = pbs.product_id 
+        inner join warehouses "w" on "w"."id" = "i2"."warehouse_id" 
+        inner join domains "d2" on "d2"."id" = "w"."domain_id" and "d2"."ext_type" ='warehouse'
+        inner join fulfillment_centers "fc" ON "fc"."center_id" = "d2"."subdomain"
+        where "Product"."type" = 'BUNDLE'
         group by "fc"."id", "fc"."name", "i2"."product_id"
       ) "dt" group by "dt"."product_id"
     )
@@ -78,24 +111,10 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
   await tx.getRepository(Product).query(
     `
     create temp table temp_warehouse_marketplace_products as (
-      SELECT "Product"."id" AS "Product_id", "Product"."sku" AS "Product_sku", "Product"."brand_sku" AS "Product_brand_sku",
-      "Product"."brand" AS "Product_brand", "Product"."sub_brand" AS "Product_sub_brand", "Product"."gtin" AS "Product_gtin",
-      "Product"."case_gtin" AS "Product_case_gtin", "Product"."name" AS "Product_name", "Product"."type" AS "Product_type", 
-      "Product"."packing_type" AS "Product_packing_type", "Product"."description" AS "Product_description", "Product"."bundle_qty" AS "Product_bundle_qty",
-      "Product"."expiration_period" AS "Product_expiration_period", "Product"."weight_unit" AS "Product_weight_unit", "Product"."weight" AS "Product_weight",
-      "Product"."gross_weight" AS "Product_gross_weight", "Product"."case_weight" AS "Product_case_weight", "Product"."case_gross_weight" AS "Product_case_gross_weight",
-      "Product"."density" AS "Product_density", "Product"."length_unit" AS "Product_length_unit", "Product"."cost_price" AS "Product_cost_price", 
-      "Product"."mrp_price" AS "Product_mrp_price", "Product"."sell_price" AS "Product_sell_price", "Product"."after_tax_cost_price" AS "Product_after_tax_cost_price", 
-      "Product"."after_tax_sales_price" AS "Product_after_tax_sales_price", "Product"."width" AS "Product_width", "Product"."depth" AS "Product_depth", 
-      "Product"."height" AS "Product_height", "Product"."volume" AS "Product_volume", "Product"."case_width" AS "Product_case_width", "Product"."case_depth" AS "Product_case_depth", 
-      "Product"."case_height" AS "Product_case_height", "Product"."case_volume" AS "Product_case_volume", "Product"."volume_size" AS "Product_volume_size", 
-      "Product"."primary_unit" AS "Product_primary_unit", "Product"."primary_value" AS "Product_primary_value", "Product"."aux_unit_1" AS "Product_aux_unit_1", 
-      "Product"."aux_value_1" AS "Product_aux_value_1", "Product"."aux_unit_2" AS "Product_aux_unit_2", "Product"."aux_value_2" AS "Product_aux_value_2", "Product"."aux_unit_3" AS "Product_aux_unit_3", 
-      "Product"."aux_value_3" AS "Product_aux_value_3", "Product"."inventory_account_code" AS "Product_inventory_account_code", "Product"."cogs_account_code" AS "Product_cogs_account_code", 
-      "Product"."movement" AS "Product_movement", "Product"."buffer_qty" AS "Product_buffer_qty", "Product"."min_qty" AS "Product_min_qty", "Product"."max_qty" AS "Product_max_qty", "Product"."discount_id" AS "Product_discount_id", 
-      "Product"."status" AS "Product_status", "Product"."is_tracked_as_inventory" AS "Product_is_tracked_as_inventory", "Product"."created_at" AS "Product_created_at", 
-      "Product"."updated_at" AS "Product_updated_at", "Product"."domain_id" AS "Product_domain_id", "Product"."bizplace_id" AS "Product_bizplace_id", 
-      "Product"."product_set_id" AS "Product_product_set_id", "Product"."creator_id" AS "Product_creator_id", "Product"."updater_id" AS "Product_updater_id", 
+      SELECT "Product"."product_id" AS "Product_id", "Product"."product_sku" AS "Product_sku", 
+      "Product"."product_name" AS "Product_name", "Product"."product_description" AS "Product_description", 
+      "Product"."product_bizplace_id" AS "Product_bizplace_id", 
+      "Product"."creator_id" AS "Product_creator_id", "Product"."updater_id" AS "Product_updater_id", 
       "Bizplace"."name" AS "Bizplace_name", "Bizplace"."description" AS "Bizplace_description", "Bizplace"."address" AS "Bizplace_address", "Bizplace"."postal_code" AS "Bizplace_postal_code", 
       "Bizplace"."latlng" AS "Bizplace_latlng", "Bizplace"."status" AS "Bizplace_status", "Bizplace"."created_at" AS "Bizplace_created_at", "Bizplace"."updated_at" AS "Bizplace_updated_at", 
       "Bizplace"."domain_id" AS "Bizplace_domain_id", "Bizplace"."company_id" AS "Bizplace_company_id", "Bizplace"."creator_id" AS "Bizplace_creator_id", "Bizplace"."updater_id" AS "Bizplace_updater_id", 
@@ -103,14 +122,12 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
       "Updater"."id" AS "Updater_id", "Updater"."name" AS "Updater_name", "Updater"."description" AS "Updater_description", "Updater"."email" AS "Updater_email"
       ,COALESCE("whInv"."Json_warehouseInventory", null) AS "Json_warehouseInventory"
       ,COALESCE("mktPrd"."Json_marketplaceProducts", null) AS "Json_marketplaceProducts"
-      FROM "products" "Product"
-      LEFT JOIN "bizplaces" "Bizplace" ON "Bizplace"."id"="Product"."bizplace_id"
+      FROM "temp_products" "Product"
+      LEFT JOIN "bizplaces" "Bizplace" ON "Bizplace"."id" = "Product"."product_bizplace_id"
       LEFT JOIN "users" "Creator" ON "Creator"."id"="Product"."creator_id"  
       LEFT JOIN "users" "Updater" ON "Updater"."id"="Product"."updater_id"
-      LEFT JOIN "temp_json_warehouse_inventory" "whInv" ON "whInv"."product_id" = "Product"."id"
-      LEFT JOIN "temp_json_warehouse_marketplace_products" "mktPrd" ON "mktPrd"."product_id" = "Product"."id"
-      WHERE "Product"."bizplace_id" IN (${bizplaceIds})
-      ${productQuery}
+      LEFT JOIN "temp_json_warehouse_inventory" "whInv" ON "whInv"."product_id" = "Product"."product_id"
+      LEFT JOIN "temp_json_warehouse_marketplace_products" "mktPrd" ON "mktPrd"."product_id" = "Product"."product_id"
     )
   `
   )
@@ -128,7 +145,7 @@ export async function warehouseMarketplaceProduct(params: ListParam, domain: Dom
   )
 
   tx.query(`
-    drop table temp_json_warehouse_marketplace_products, temp_json_warehouse_inventory, temp_warehouse_marketplace_products
+    drop table temp_products, temp_json_warehouse_marketplace_products, temp_json_warehouse_inventory, temp_warehouse_marketplace_products
   `)
 
   return {

package/server/routers/etrax-router.ts

@@ -1,9 +1,10 @@
 import Router from 'koa-router'
 import { getRepository } from 'typeorm'
-import { config } from '@things-factory/env'
-import { StoreAPI, MarketplaceStore } from '@things-factory/integration-marketplace'
-import { LastMileDelivery, Etrax } from '@things-factory/integration-lmd'
+
+import { Etrax, LastMileDelivery } from '@things-factory/integration-lmd'
+import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
 import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
+
 //import { MarketplaceOrder, MarketplaceOrderShipping, MarketplaceOrderItem } from "@things-factory/marketplace-base"
 
 const debug = require('debug')('things-factory:jest.config')
@@ -81,9 +82,10 @@ etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
     const storeId = order.marketplaceStore.id
     const marketplaceStore: MarketplaceStore = await StoreAPI.getMarketplaceStore(storeId)
 
+    // to-do update tracking no to every marketplaces
     if (marketplaceStore.platform === 'woocommerce') {
       const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo
-      const orderNote = await StoreAPI.createOrderNote(marketplaceStore, { orderId: order.orderNo, note })
+      const orderNote = await StoreAPI.createOrderNote(marketplaceStore, { orderId: order.name, note })
     }
 
     const resp = {

package/translations/en.json

@@ -21,6 +21,7 @@
   "button.save-and-next": "save and next",
   "button.save-and-prev": "save and prev",
   "button.set": "set",
+  "button.split_order": "split order",
   "button.submit": "submit",
   "button.sync_order": "sync order",
   "button.sync_product": "sync product",
@@ -56,12 +57,15 @@
   "field.not_assigned": "not assigned",
   "field.on_hold": "on hold",
   "field.order_no": "order no",
+  "field.own_shipping_carrier": "own shipping carrier",
+  "field.own_tracking_no": "own tracking no",
   "field.pack_qty": "pack qty",
   "field.pack_weight": "pack weight",
   "field.packing_type": "packing type",
   "field.pallet_qty": "pallet qty",
   "field.pickup_date": "pickup date",
   "field.pickup_time_id": "pickup time id",
+  "field.post_code": "post code",
   "field.price": "price",
   "field.product_info": "product info",
   "field.product_name": "product name",
@@ -90,6 +94,7 @@
   "field.total_amount": "total amount",
   "field.total_uom_value": "total UOM value",
   "field.total_weight": "total weight",
+  "field.total_volume": "total volume",
   "field.town": "town",
   "field.tracking_no": "tracking no",
   "field.type": "type",
@@ -103,6 +108,7 @@
   "field.variation_qty": "variation qty",
   "field.variation_selling_price": "variation selling price",
   "field.variation_sku": "variation sku",
+  "field.variation_uom_value": "variation uom value",
   "field.zipcode": "zipcode",
   "label.address": "address",
   "label.address_id": "address id",
@@ -115,12 +121,15 @@
   "label.buffer_stock": "buffer stock",
   "label.bundle_product": "bundle product",
   "label.canceled": "canceled",
+  "label.cancelled": "cancelled",
   "label.channel_sku": "channel SKU",
   "label.city": "city",
+  "label.completed": "completed",
   "label.container_no": "container no.",
   "label.container_size": "container size",
   "label.container": "container",
   "label.cost_price": "cost price",
+  "label.courier_service": "courier service",
   "label.create_release_order": "create release order",
   "label.delivered": "delivered",
   "label.delivery_type": "delivery type",
@@ -135,6 +144,7 @@
   "label.items": "items",
   "label.length": "length",
   "label.loose_item": "loose item",
+  "label.order_max_weight": "order maximum weight",
   "label.order_status_approved": "approved",
   "label.order_status_arrived": "arrived",
   "label.order_status_canceled": "canceled",
@@ -169,8 +179,11 @@
   "label.order_status_rejected": "rejected",
   "label.order_status_shipped": "shipped",
   "label.order_status_to_confirm_receive": "to confirm receive",
+  "label.own_shipping_provider": "own shipping provider",
+  "label.own_tracking_no": "own tracking no",
   "label.own_transport": "own transport",
   "label.oversell_will_happen_with_all_full_allocation": "oversell will happen with all 100% allocation",
+  "label.packed": "packed",
   "label.parent_sku": "parent SKU",
   "label.pending": "pending",
   "label.phone": "phone",
@@ -199,6 +212,7 @@
   "label.sku": "sku",
   "label.threshold_value": "threshold value",
   "label.timeslot_info": "timeslot",
+  "label.to_confirm_receive": "to confirm receive",
   "label.to_date": "to date",
   "label.tracking_no": "tracking no",
   "label.truck_no": "truck no.",
@@ -253,6 +267,7 @@
   "text.product_stock_is_empty": "product is empty",
   "text.product_weight_is_empty": "product weight is empty",
   "text.reason_x": "reason: {x}",
+  "text.select_courier": "select courier",
   "text.select_a_delivery_type": "select a delivery type",
   "text.select_a_logistics_type": "select a logistics type",
   "text.select_a_shipping_provider": "select a shipping provider",
@@ -270,6 +285,7 @@
   "text.tracking_no_is_empty": "tracking no is empty",
   "text.update_draft_product": "update draft product",
   "text.update_stock_allocation_ratio": "update stock allocation ratio",
+  "text.update_marketplace_order_max_weight": "update marketplace order maximum weight",
   "text.you_wont_be_able_to_revert_this": "you won't be able to revert this",
   "title.are_you_sure": "are you sure",
   "title.attachment": "attachment",

package/translations/ko.json

@@ -21,6 +21,7 @@
   "button.save-and-next": "[ko] save and next",
   "button.save-and-prev": "[ko] save and prev",
   "button.set": "[ko] set",
+  "button.split_order": "[ko] split order",
   "button.submit": "[ko] submit",
   "button.sync_order": "[ko] sync order",
   "button.sync_product": "[ko] sync product",
@@ -56,12 +57,15 @@
   "field.not_assigned": "[ko] not assigned",
   "field.on_hold": "[ko] on hold",
   "field.order_no": "[ko] order no",
+  "field.own_shipping_carrier": "[ko] own shipping carrier",
+  "field.own_tracking_no": "[ko] own tracking no",
   "field.pack_qty": "[ko] pack qty",
   "field.pack_weight": "[ko] pack weight",
   "field.packing_type": "[ko] packing type",
   "field.pallet_qty": "[ko] pallet qty",
   "field.pickup_date": "[ko] pickup date",
   "field.pickup_time_id": "[ko] pickup time id",
+  "field.post_code": "[ko] post code",
   "field.price": "[ko] price",
   "field.product_info": "[ko] product info",
   "field.product_name": "[ko] product name",
@@ -103,6 +107,7 @@
   "field.variation_qty": "[ko] variation qty",
   "field.variation_selling_price": "[ko] variation selling price",
   "field.variation_sku": "[ko] variation sku",
+  "field.variation_uom_value": "[ko] variation uom value",
   "field.zipcode": "[ko] zipcode",
   "label.address": "[ko] address",
   "label.address_id": "[ko] address id",
@@ -115,8 +120,10 @@
   "label.buffer_stock": "[ko] buffer stock",
   "label.bundle_product": "[ko] bundle product",
   "label.canceled": "[ko] canceled",
+  "label.cancelled": "[ko] cancelled",
   "label.channel_sku": "[ko] channel SKU",
   "label.city": "[ko] city",
+  "label.completed": "[ko] completed",
   "label.container_no": "[ko] container no.",
   "label.container_size": "[ko] container size",
   "label.container": "[ko] container",
@@ -134,6 +141,7 @@
   "label.isku": "[ko] ISKU",
   "label.length": "[ko] length",
   "label.loose_item": "[ko] loose item",
+  "label.order_max_weight": "[ko] order maximum weight",
   "label.order_status_approved": "[ko] approved",
   "label.order_status_arrived": "[ko] arrived",
   "label.order_status_canceled": "[ko] canceled",
@@ -168,7 +176,10 @@
   "label.order_status_rejected": "[ko] rejected",
   "label.order_status_shipped": "[ko] shipped",
   "label.order_status_to_confirm_receive": "[ko] to confirm receive",
+  "label.own_shipping_provider": "[ko] own shipping provider",
+  "label.own_tracking_no": "[ko] own tracking no",
   "label.own_transport": "[ko] own transport",
+  "label.packed": "[ko] packed",
   "label.parent_sku": "[ko] parent SKU",
   "label.pending": "[ko] pending",
   "label.phone": "[ko] phone",
@@ -195,6 +206,7 @@
   "label.sku": "[ko] sku",
   "label.threshold_value": "[ko] threshold value",
   "label.timeslot_info": "[ko] timeslot",
+  "label.to_confirm_receive": "[ko] to confirm receive",
   "label.to_date": "[ko] to date",
   "label.tracking_no": "[ko] tracking no",
   "label.truck_no": "[ko] truck no.",
@@ -257,6 +269,8 @@
   "text.successfully_fetch_latest_data": "[ko] successfully fetch latest data",
   "text.tracking_no_is_empty": "[ko] tracking no is empty",
   "text.update_draft_product": "[ko] update draft product",
+  "text.update_stock_allocation_ratio": "[ko] update stock allocation ratio",
+  "text.update_marketplace_order_max_weight": "[ko] update marketplace order maximum weight",
   "text.you_wont_be_able_to_revert_this": "[ko] you won't be able to revert this",
   "title.are_you_sure": "[ko] are you sure",
   "title.attachment": "[ko] attachment",

package/translations/ms.json

@@ -21,6 +21,7 @@
   "button.save-and-next": "[ms] save and next",
   "button.save-and-prev": "[ms] save and prev",
   "button.set": "[ms] set",
+  "button.split_order": "[ms] split order",
   "button.submit": "[ms] submit",
   "button.sync_order": "[ms] sync order",
   "button.sync_product": "[ms] sync product",
@@ -56,12 +57,15 @@
   "field.not_assigned": "[ms] not assigned",
   "field.on_hold": "[ms] on hold",
   "field.order_no": "[ms] order no",
+  "field.own_shipping_carrier": "[ms] own shipping carrier",
+  "field.own_tracking_no": "[ms] own tracking no",
   "field.pack_qty": "[ms] pack qty",
   "field.pack_weight": "[ms] pack weight",
   "field.packing_type": "[ms] packing type",
   "field.pallet_qty": "[ms] pallet qty",
   "field.pickup_date": "[ms] pickup date",
   "field.pickup_time_id": "[ms] pickup time id",
+  "field.post_code": "[ms] post code",
   "field.price": "[ms] price",
   "field.product_info": "[ms] product info",
   "field.product_name": "[ms] product name",
@@ -103,6 +107,7 @@
   "field.variation_qty": "[ms] variation qty",
   "field.variation_selling_price": "[ms] variation selling price",
   "field.variation_sku": "[ms] variation sku",
+  "field.variation_uom_value": "[ms] variation uom value",
   "field.zipcode": "[ms] zipcode",
   "label.address": "[ms] address",
   "label.address_id": "[ms] address id",
@@ -115,8 +120,10 @@
   "label.buffer_stock": "[ms] buffer stock",
   "label.bundle_product": "[ms] bundle product",
   "label.canceled": "[ms] canceled",
+  "label.cancelled": "[ms] cancelled",
   "label.channel_sku": "[ms] channel SKU",
   "label.city": "[ms] city",
+  "label.completed": "[ms] completed",
   "label.container_no": "[ms] container no.",
   "label.container_size": "[ms] container size",
   "label.container": "[ms] container",
@@ -134,6 +141,7 @@
   "label.isku": "[ms] ISKU",
   "label.length": "[ms] length",
   "label.loose_item": "[ms] loose item",
+  "label.order_max_weight": "[ms] order maximum weight",
   "label.order_status_approved": "[ms] approved",
   "label.order_status_arrived": "[ms] arrived",
   "label.order_status_canceled": "[ms] canceled",
@@ -168,7 +176,10 @@
   "label.order_status_rejected": "[ms] rejected",
   "label.order_status_shipped": "[ms] shipped",
   "label.order_status_to_confirm_receive": "[ms] to confirm receive",
+  "label.own_shipping_provider": "[ms] own shipping provider",
+  "label.own_tracking_no": "[ms] own tracking no",
   "label.own_transport": "[ms] own transport",
+  "label.packed": "[ms] packed",
   "label.parent_sku": "[ms] parent SKU",
   "label.pending": "[ms] pending",
   "label.phone": "[ms] phone",
@@ -195,6 +206,7 @@
   "label.sku": "[ms] sku",
   "label.threshold_value": "[ms] threshold value",
   "label.timeslot_info": "[ms] timeslot",
+  "label.to_confirm_receive": "[ms] to confirm receive",
   "label.to_date": "[ms] to date",
   "label.tracking_no": "[ms] tracking no",
   "label.truck_no": "[ms] truck no.",
@@ -257,6 +269,8 @@
   "text.successfully_fetch_latest_data": "[ms] successfully fetch latest data",
   "text.tracking_no_is_empty": "[ms] tracking no is empty",
   "text.update_draft_product": "[ms] update draft product",
+  "text.update_stock_allocation_ratio": "[ms] update stock allocation ratio",
+  "text.update_marketplace_order_max_weight": "[ms] update marketplace order maximum weight",
   "text.you_wont_be_able_to_revert_this": "[ms] you won't be able to revert this",
   "title.are_you_sure": "[ms] are you sure",
   "title.attachment": "[ms] attachment",

package/translations/zh.json

@@ -21,6 +21,7 @@
   "button.save-and-next": "[zh] save and next",
   "button.save-and-prev": "[zh] save and prev",
   "button.set": "[zh] set",
+  "button.split_order": "[zh] split order",
   "button.submit": "[zh] submit",
   "button.sync_order": "[zh] sync order",
   "button.sync_product": "[zh] sync product",
@@ -56,12 +57,15 @@
   "field.not_assigned": "[zh] not assigned",
   "field.on_hold": "[zh] on hold",
   "field.order_no": "[zh] order no",
+  "field.own_shipping_carrier": "[zh] own shipping carrier",
+  "field.own_tracking_no": "[zh] own tracking no",
   "field.pack_qty": "[zh] pack qty",
   "field.pack_weight": "[zh] pack weight",
   "field.packing_type": "[zh] packing type",
   "field.pallet_qty": "[zh] pallet qty",
   "field.pickup_date": "[zh] pickup date",
   "field.pickup_time_id": "[zh] pickup time id",
+  "field.post_code": "[zh] post code",
   "field.price": "[zh] price",
   "field.product_info": "[zh] product info",
   "field.product_name": "[zh] product name",
@@ -103,6 +107,7 @@
   "field.variation_qty": "[zh] variation qty",
   "field.variation_selling_price": "[zh] variation selling price",
   "field.variation_sku": "[zh] variation sku",
+  "field.variation_uom_value": "[zh] variation uom value",
   "field.zipcode": "[zh] zipcode",
   "label.address": "[zh] address",
   "label.address_id": "[zh] address id",
@@ -115,8 +120,10 @@
   "label.buffer_stock": "[zh] buffer stock",
   "label.bundle_product": "[zh] bundle product",
   "label.canceled": "[zh] canceled",
+  "label.cancelled": "[zh] cancelled",
   "label.channel_sku": "[zh] channel SKU",
   "label.city": "[zh] city",
+  "label.completed": "[zh] completed",
   "label.container_no": "[zh] container no.",
   "label.container_size": "[zh] container size",
   "label.container": "[zh] container",
@@ -134,6 +141,7 @@
   "label.isku": "[zh] ISKU",
   "label.length": "[zh] length",
   "label.loose_item": "[zh] loose item",
+  "label.order_max_weight": "[zh] order maximum weight",
   "label.order_status_approved": "[zh] approved",
   "label.order_status_arrived": "[zh] arrived",
   "label.order_status_canceled": "[zh] canceled",
@@ -168,7 +176,10 @@
   "label.order_status_rejected": "[zh] rejected",
   "label.order_status_shipped": "[zh] shipped",
   "label.order_status_to_confirm_receive": "[zh] to confirm receive",
+  "label.own_shipping_provider": "[zh] own shipping provider",
+  "label.own_tracking_no": "[zh] own tracking no",
   "label.own_transport": "[zh] own transport",
+  "label.packed": "[zh] packed",
   "label.parent_sku": "[zh] parent SKU",
   "label.pending": "[zh] pending",
   "label.phone": "[zh] phone",
@@ -195,6 +206,7 @@
   "label.sku": "[zh] sku",
   "label.threshold_value": "[zh] threshold value",
   "label.timeslot_info": "[zh] timeslot",
+  "label.to_confirm_receive": "[zh] to confirm receive",
   "label.to_date": "[zh] to date",
   "label.tracking_no": "[zh] tracking no",
   "label.truck_no": "[zh] truck no.",
@@ -257,6 +269,8 @@
   "text.successfully_fetch_latest_data": "[zh] successfully fetch latest data",
   "text.tracking_no_is_empty": "[zh] tracking no is empty",
   "text.update_draft_product": "[zh] update draft product",
+  "text.update_stock_allocation_ratio": "[zh] update stock allocation ratio",
+  "text.update_marketplace_order_max_weight": "[zh] update marketplace order maximum weight",
   "text.you_wont_be_able_to_revert_this": "[zh] you won't be able to revert this",
   "title.are_you_sure": "[zh] are you sure",
   "title.attachment": "[zh] attachment",

package/views/auth-page.html

@@ -15,7 +15,7 @@
     <link rel="manifest" href="/assets/manifest.json" />
 
     <!-- See https://goo.gl/qRE0vM -->
-    <meta name="theme-color" content="#3f51b5" />
+    <meta name="theme-color" content="#22a6a7" />
 
     <!-- Add to homescreen for Chrome on Android. Fallback for manifest.json -->
     <meta name="mobile-web-app-capable" content="yes" />

package/views/public/home.html

@@ -15,7 +15,7 @@
     <link rel="manifest" href="/assets/manifest.json" />
 
     <!-- See https://goo.gl/qRE0vM -->
-    <meta name="theme-color" content="#3f51b5" />
+    <meta name="theme-color" content="#22a6a7" />
 
     <!-- Add to homescreen for Chrome on Android. Fallback for manifest.json -->
     <meta name="mobile-web-app-capable" content="yes" />