comee_core 0.3.13 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e018316397b9835966d15f409f2884a9e1cc3749eef845f92f36a4ab72ecad
-  data.tar.gz: 5bf530dcf32e3567c152ff57ba3d339a4f0f0feae80581d85215daa3c124d77a
+  metadata.gz: e4b933796931ae7b24c03d2e6901df6b6f4c1b27f314b1b967eabb13da3654fd
+  data.tar.gz: f257c672d231e620f292d3ca60aadc72620ef4f5fbaa68a7dc0076cc3ddf4542
 SHA512:
-  metadata.gz: 102bc7736fb711184cc69fc515df446b4c850eeab201a3eb8449b524b5fa2c780f74208489732a4f111dcb3f92609db9b980298e3f20275bd6ef7aa09fbe16c1
-  data.tar.gz: 1d3c76695cadb18c210e59084e0e350f865d86a4a5d1c0df4b7eec91eca7cf4cacf8d9cc650ccab00f959c0eb8673f6ee39d9ca72987f498344fd329eba52627
+  metadata.gz: 24013af0d8419d7d880de21c574cfa21b39c9d70cf67dda64ed2f32a8b1b78dc90b6622c8e25fa638b7db6821e46ad43a880ab1bfabb6ef8b34b914bb0ff233d
+  data.tar.gz: 1c9e73ac25c7f40809265ba6a844f458ba51a6e0e0daadaa67c09643b9964a9f4b2ac7a8bd1c6d665a28d1a602726338d62d24ba639b50bc03d5ae90ac750d41

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

@@ -5,13 +5,16 @@ module Comee
 
       def index
         super do
-          Client.includes(:parent, :agents, :contacts, :client_warehouses, :country, :user, :currency).all
+          Client.includes(
+            :parent, :agents, :contacts, :client_warehouses, :client_addresses, :country, :user, :currency
+          ).all
         end
       end
 
       def filter
-        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses, :country, :user, :currency)
-                        .ransack(params[:q]).result
+        clients = Client.includes(
+          :parent, :agents, :contacts, :client_warehouses, :client_addresses, :country, :user, :currency
+        ).ransack(params[:q]).result
         render_content(clients)
       end
 

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

@@ -13,7 +13,8 @@ module Comee
       end
 
       def filter
-        shipment_item = ShipmentItem.includes(:sales_order_item).ransack(params[:q]).result
+        shipment_item = ShipmentItem.includes(sales_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"]}
         render_content(shipment_item, options)
       end

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

@@ -4,7 +4,7 @@ module Comee
       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,
-                 :consolidator_date, :voyage_no, :shipping_arrangement, :remark, :created_by, :files_url, :created_at
+                 :vat, :consolidator_date, :voyage_no, :shipping_arrangement, :remark, :created_by, :files_url, :created_at
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.13".freeze
+    VERSION = "0.3.15".freeze
   end
 end

metadata

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