comee_core 0.3.27 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fcdc2d3181c86c758211659e916fad888c721853b243a574b214cf346857b5c
-  data.tar.gz: 5211e208480c35c0abfb7fc25d74f6e63d4be24ae1ad598364bc50fd7b6c9656
+  metadata.gz: 57faf16fdbce0fcaedaf5ba0ac693ee8d949dc959816bc8efa9fbe047e407f47
+  data.tar.gz: 59220d9d110eb8df5134f0716e183abab839dd1888268f0c0db2147cb7fbe202
 SHA512:
-  metadata.gz: 302ab6758617d98c1f6d531c0406095d8bc2d6278d8b117a2434133a5a6d63730c58f5feb5c17991a49e6feb490df30de2021261652a1f231616767b813e5256
-  data.tar.gz: 7df0feed10ece41750cf9b2fea1a5a9fe3be91fc7928666d29dcc4b64025681dda7eae4df917bcd1d733362a443d8ceda430ee22647e0d4cadea95300ec1a9a3
+  metadata.gz: 7c61ba3958a147ef8fdbdb3e6e1e1cc71ed925c76f31dad47f093e65bf707d97467e6dd11b6136071304e8b2036502e44a768e6c14770828f14d9c894f6eb879
+  data.tar.gz: 9f0fccab211cc2a58c78fd1969cb39c3e0341bdd935ae7934cd172516ce2cd2de4c833b9289d4bf5c746c0937f93ac2039e93a0d53537d1bda280abe2888b79e

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

@@ -13,9 +13,16 @@ module Comee
       end
 
       def filter
-        shipment_item = ShipmentItem.includes(sales_order_item: [:unit, :product, sales_order: :client])
+        shipment_item = ShipmentItem.includes(sales_order_item: [:customer_order_item, :unit, :product, sales_order: :client])
                                     .ransack(params[:q]).result
-        options = {include: ["sales_order_item.sales_order.client", "sales_order_item.product", "sales_order_item.unit"]}
+        options = {
+          include: [
+            "sales_order_item.sales_order.client",
+            "sales_order_item.product",
+            "sales_order_item.unit",
+            "sales_order_item.customer_order_item"
+          ]
+        }
         render_content(shipment_item, options)
       end
 

data/app/serializers/comee/core/client_address_serializer.rb

@@ -1,8 +1,8 @@
 module Comee
   module Core
     class ClientAddressSerializer < ActiveModel::Serializer
-      attributes :id, :name, :address_line1, :street, :city, :state, :country_id, :postal_code, :address_type,
-                 :email, :telephone, :client_id, :default
+      attributes :id, :name, :address_line1, :street, :city, :state, :postal_code, :address_type, :email, :telephone,
+                 :client_id, :default
 
       belongs_to :client
       belongs_to :country

data/app/serializers/comee/core/sales_order_serializer.rb

@@ -1,12 +1,15 @@
 module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
-      attributes :id, :order_number, :order_date, :order_terms, :shipment_address, :delivery_address, :invoice_address,
-                 :destination, :handover_date, :shipping_date, :delivery_date, :consignee, :parent_client_name, :payment_term,
-                 :delivery_term, :payment_penalty, :status, :purchase_status, :total_price, :amount_paid, :pallete_note,
-                 :vat, :consolidator_date, :voyage_no, :shipping_arrangement, :remark, :created_by, :files_url, :created_at
+      attributes :id, :order_number, :order_date, :order_terms, :destination, :handover_date, :shipping_date,
+                 :delivery_date, :consignee, :parent_client_name, :payment_term, :delivery_term, :payment_penalty,
+                 :status, :purchase_status, :total_price, :amount_paid, :pallete_note, :vat, :consolidator_date,
+                 :voyage_no, :shipping_arrangement, :remark, :created_by, :files_url, :created_at
       belongs_to :customer_order
       belongs_to :client
+      belongs_to :shipment_address, serializer: ClientAddressSerializer
+      belongs_to :delivery_address, serializer: ClientAddressSerializer
+      belongs_to :invoice_address, serializer: ClientAddressSerializer
       belongs_to :fulfillment_center
       has_many :sales_order_items
       has_one :customs_detail

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.27".freeze
+    VERSION = "0.3.29".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.3.29
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers