comee_core 0.3.30 → 0.3.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0660399e408bf93ae519d05f92748000531cfca7c93a9fad3623713e5767c7dd'
-  data.tar.gz: 76730d642a21e1e2f5088475bed3db16ea554f7ca587343215b116340e62db73
+  metadata.gz: c18153c80265bb45d836e0b68af5f6e3fd18dc772af51b7da9efcc53083133a2
+  data.tar.gz: fec87bf023996bbbfcb6c5d77730daf4b6937a832aa914c37a2a80574583825b
 SHA512:
-  metadata.gz: b4fa53a4fb299435ba229876360d4bacf0507965840f1ef184e17ff1b13087cc578b885628fdbacb57974cea778e0846ce2df38db9248b74438553e6970e131b
-  data.tar.gz: 0c70b10a328be696f1cf47a6eaa5f218c4280b7424716107f46d2e2babb5b03fba2f6851c644e789884d758c7f12cd3c74e6b19448c16fb53c606d445502df89
+  metadata.gz: 74551f6fdc8bc92b5b02a4e26dd07655fed65257802ce5ad825c04f1da2fa0773637c1cc4040287be7ff4bc2457ac7a7115c6f790af9001a0477b2d32a383521
+  data.tar.gz: e8fd48158eb041128207046e118ed644615fd8976addad16a38f5fae769a2100d50593f8249b022a5daa988628003737625405bfa0d9e17d6d1e50326f38fe85

data/app/controllers/comee/core/client_addresses_controller.rb

@@ -5,7 +5,7 @@ module Comee
 
       def index
         super do
-          ClientAddress.where(client_id: params[:id])
+          ClientAddress.includes(:client, :country).where(client_id: params[:id])
         end
       end
 

data/app/controllers/comee/core/customer_orders_controller.rb

@@ -57,7 +57,14 @@ module Comee
       end
 
       def filter
-        orders = CustomerOrder.includes(:client, :customer_order_items).ransack(params[:q]).result
+        orders = CustomerOrder.includes(
+          :shipment_address,
+          :delivery_address,
+          :invoice_address,
+          :customer_order_items,
+          :file_attachment,
+          client: %i[user currency]
+        ).ransack(params[:q]).result
         render_content(orders, include: ["client", "customer_order_items.unit"])
       end
 

data/app/controllers/comee/core/sales_order_items_controller.rb

@@ -33,7 +33,7 @@ module Comee
             {shipment_instruction_items: :pod},
             :item_statuses
           ],
-          sales_order: :fulfillment_center,
+          # sales_order: :fulfillment_center,
           purchase_order_item: [{purchase_order: :supplier}]
         ).find(params[:id])
         render_content(

data/app/controllers/comee/core/sales_orders_controller.rb

@@ -10,6 +10,9 @@ module Comee
             :customer_order,
             :client,
             :customs_detail,
+            shipment_address: :country,
+            delivery_address: :country,
+            invoice_address: :country,
             sales_order_items: :unit
           ).order(created_at: :desc)
           [
@@ -20,6 +23,9 @@ module Comee
               "sales_order_items",
               "sales_order_items.product",
               "sales_order_items.unit",
+              "shipment_address.country",
+              "delivery_address.country",
+              "invoice_address.country",
               "customs_detail",
               "fulfillment_center"
             ]
@@ -30,13 +36,24 @@ module Comee
       def show
         super do
           [
-            SalesOrder.includes(:customer_order, :client, :customs_detail, sales_order_items: :unit).find(params[:id]),
+            SalesOrder.includes(
+              :customer_order,
+              :client,
+              :customs_detail,
+              shipment_address: :country,
+              delivery_address: :country,
+              invoice_address: :country,
+              sales_order_items: :unit
+            ).find(params[:id]),
             include: [
               "client",
               "customer_order",
               "sales_order_items",
               "sales_order_items.product",
               "sales_order_items.unit",
+              "shipment_address.country",
+              "delivery_address.country",
+              "invoice_address.country",
               "customs_detail",
               "fulfillment_center"
             ]
@@ -64,6 +81,9 @@ module Comee
           :customer_order,
           :client,
           :customs_detail,
+          shipment_address: :country,
+          delivery_address: :country,
+          invoice_address: :country,
           sales_order_items: %i[unit customer_order_item]
         ).ransack(params[:q]).result
         render_content(
@@ -74,6 +94,9 @@ module Comee
             "sales_order_items.product",
             "sales_order_items.unit",
             "sales_order_items.customer_order_item",
+            "shipment_address.country",
+            "delivery_address.country",
+            "invoice_address.country",
             "customs_detail",
             "fulfillment_center"
           ]

data/app/models/comee/core/customer_order_item.rb

@@ -3,7 +3,7 @@ module Comee
     class CustomerOrderItem < ApplicationRecord
       default_scope { order(serial_no: :asc) }
 
-      before_save :calculate_total_price
+      before_save :calculate_total_price, :fetch_customer_item_alias
 
       belongs_to :customer_order
       belongs_to :product
@@ -18,6 +18,16 @@ module Comee
         self.total_price = (price * quantity).round(2)
       end
 
+      def fetch_customer_item_alias
+        self.customer_item_alias = "" unless customer_order && product_id
+        lookup = ProductLookup.find_by(
+          itemable_id: customer_order.client_id,
+          itemable_type: "Comee::Core::Client",
+          product_id: product_id
+        )
+        self.customer_item_alias = lookup&.aliases
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[id customer_order_id product_id unit_id customer_item_no customer_item_description delivery_date]
       end

data/app/models/comee/core/product_lookup.rb

@@ -9,7 +9,7 @@ module Comee
       validates :code, uniqueness: {scope: %i[product_id itemable_id itemable_type]}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id code item_description itemable_id itemable_type product_id alias]
+        %w[id code item_description itemable_id itemable_type product_id aliases]
       end
 
       def self.ransackable_associations(_auth_object = nil)

data/app/services/comee/core/customer_order_service.rb

@@ -208,6 +208,7 @@ module Comee
               unit_id: unit_id,
               serial_no: item.serial_no,
               customer_item_no: item.customer_item_no,
+              customer_item_alias: item.customer_item_alias,
               customer_item_description: item.customer_item_description,
               quantity: quantity,
               price: price,

data/db/migrate/20240716143922_add_customer_item_alias_to_customer_and_sales_order.rb

@@ -0,0 +1,6 @@
+class AddCustomerItemAliasToCustomerAndSalesOrder < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_customer_order_items, :customer_item_alias, :string, null: true
+    add_column :comee_core_sales_order_items, :customer_item_alias, :string, null: true
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.30".freeze
+    VERSION = "0.3.32".freeze
   end
 end

data/spec/factories/comee/core/sales_order_items.rb

@@ -8,6 +8,7 @@ FactoryBot.define do
     unit { customer_order_item.unit }
     purchase_order_item { nil }
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
+    customer_item_alias { Faker::Alphanumeric.alpha(number: 10) }
     customer_item_description { Faker::Lorem.sentence }
     quantity { customer_order_item.quantity }
     quantity_diff { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.32
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-12 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -524,6 +524,7 @@ files:
 - db/migrate/20240406162711_create_comee_core_goods_issued_items.rb
 - db/migrate/20240407083617_create_comee_core_email_settings.rb
 - db/migrate/20240630122016_create_comee_core_additional_services.rb
+- db/migrate/20240716143922_add_customer_item_alias_to_customer_and_sales_order.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb