comee_core 0.3.31 → 0.3.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c353f01f7b2002be8196b8780c03ff71f736b32e06b1f0681dcd076054612bd7
-  data.tar.gz: 1acab6725681102492076d1320ade2a16e76560e5365652b6d264d4e9faf1a1b
+  metadata.gz: e6c589c25e5e2b41ad83a56f366e896c5b7faf3688a83c9f5374fb32da59b627
+  data.tar.gz: 1bf5521076bda84877681a8332fcd2164b3cd44f7b45e06e9cf77e07dcfbfb5d
 SHA512:
-  metadata.gz: bab2fae60986b88974db163c68d4072944193d70d5b4d26a57dc6cb9f17e8f0ffc09bfe1007c7afb3b29298a78d1df2dfc2dc109e503d2a13f43429b216d87d4
-  data.tar.gz: 58806c057cc6fe60f9acc9362ff0f258324bb2778a2705db7546e46a36853a4a160b7cd198bc85b043d7f95ba706aee4cae1e5933a9dcea0672d6909e893173d
+  metadata.gz: 638fe7dbf70fff745c9141b57f436788d77ae03d2fd9ae684181504d3e9a5a024c65ce59cc7cbf4d85ba30b1bc3eabc2b2ea3706a00e76619a02f644d756f89a
+  data.tar.gz: f81537b7037404f9ab7d4a911cee199b2909c33d7a021668a44864baa92d2dbbbe1130b1301fab00df96bc7b14b111c3d2d0e8a312c6ffae4baf47a9a7cc6494

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/shipment_instruction_item.rb

@@ -7,7 +7,7 @@ module Comee
       belongs_to :pod, optional: true
       belongs_to :delivery_note, optional: true
 
-      validates :delivery_note_no, :pallet_no, :goods_issue_date, presence: true
+      validates :pallet_no, presence: true
       validates :length, :width, :height, :weight, :quantity, :price, presence: true, numericality: {greater_than: 0}
     end
   end

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/db/migrate/20240718103456_make_delivery_note_no_and_goods_issue_date_optional.rb

@@ -0,0 +1,6 @@
+class MakeDeliveryNoteNoAndGoodsIssueDateOptional < ActiveRecord::Migration[7.1]
+  def change
+    change_column :comee_core_shipment_instruction_items, :delivery_note_no, :string, null: true
+    change_column :comee_core_shipment_instruction_items, :goods_issue_date, :date, null: true
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.31".freeze
+    VERSION = "0.3.33".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.31
+  version: 0.3.33
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-13 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -524,6 +524,8 @@ 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
+- db/migrate/20240718103456_make_delivery_note_no_and_goods_issue_date_optional.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb