comee_core 0.3.28 → 0.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b87d62a42b3358d3afd0cf3413f5853fb8250eec4815520b062db6a102dedf
-  data.tar.gz: da2adbf7dd043332727a882ce22d9d07895974d2f21cd124347b46e4d42fd0c6
+  metadata.gz: '0660399e408bf93ae519d05f92748000531cfca7c93a9fad3623713e5767c7dd'
+  data.tar.gz: 76730d642a21e1e2f5088475bed3db16ea554f7ca587343215b116340e62db73
 SHA512:
-  metadata.gz: 13f4bced662c0ebdad632ec6c940fc5ea9d24a2f3b216e6abe1305ae6ab037a12aed834f689ff2a3bc07bb8ae2d32791129e083fb494d597b5f7bc42d380b566
-  data.tar.gz: 270309f54f525a8ea3e37cbfc224f89deea09854e6468c4b160ee82667f991b9c95a4bc4e819f1482b0b416cb6d4c7567d277e5a8da8e118c5bea4a5d8691361
+  metadata.gz: b4fa53a4fb299435ba229876360d4bacf0507965840f1ef184e17ff1b13087cc578b885628fdbacb57974cea778e0846ce2df38db9248b74438553e6970e131b
+  data.tar.gz: 0c70b10a328be696f1cf47a6eaa5f218c4280b7424716107f46d2e2babb5b03fba2f6851c644e789884d758c7f12cd3c74e6b19448c16fb53c606d445502df89

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

@@ -18,6 +18,7 @@ module Comee
         options = {
           include: [
             "sales_order_item.sales_order.client",
+            "sales_order_item.sales_order.customer_order",
             "sales_order_item.product",
             "sales_order_item.unit",
             "sales_order_item.customer_order_item"

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.28".freeze
+    VERSION = "0.3.30".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.28
+  version: 0.3.30
 platform: ruby
 authors:
 - Henock L.