comee_core 0.2.31 → 0.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b88368021252fc6b94d5d6249d242ba646fcdb299a16d3fa55bdcc11fe1129b
-  data.tar.gz: 05fe8866c539c134e0a563cefd2c8425e2d4c005117272fc87338b47597501c2
+  metadata.gz: 6619eb773ad35fccfea933cf7770f0a4b24ebf46a3f2874d7c75153d5b9cb41c
+  data.tar.gz: b3821a41b7a0275d4b4647dae8a712334a2a04625405f86365d773843ba8cdac
 SHA512:
-  metadata.gz: 662612111fcf879502c8fe0f941d8e2f40c696a89bf78cbd5bb045a494a030266e550da48731514879f798e807e2e80fda110ec358e27bf61b5011fe14ed8d3e
-  data.tar.gz: 436fc32e865bc87804a5379df097c5b862cf0695e48ed236e5b53a5ed694eaf7684d96644bd8a8372af3eac975fa49aae5d547b3975e117a4fe088dd49f87a79
+  metadata.gz: 1216ca3faffbc0fda6176d90195819549a905d2d2984f63f90a1af61d270f17b78f9c5a67a46c5ead7ba35a1a64a993fc02ff99e430063aa4b366c1dd83075c4
+  data.tar.gz: 5641da7714023cd6d6c8673e95a6fe262e3c2726a80f392ff6c0c0783c2f15f2f63da085e61902f81b6253c529af32abec51cfba6bc59b0b1061195bf6d482d0

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

@@ -55,7 +55,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, :currency,
+        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, :currency, :subsidiary,
                                         consignees: [])
       end
 

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

@@ -6,10 +6,22 @@ module Comee
 
       def index
         super do
-          data = SalesOrder.includes(:customer_order, :client, sales_order_items: :unit).order(created_at: :desc)
+          data = SalesOrder.includes(
+            :customer_order,
+            :client,
+            :customs_detail,
+            sales_order_items: :unit
+          ).order(created_at: :desc)
           [
             data,
-            fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
+            fields: [
+              "client",
+              "customer_order",
+              "sales_order_items",
+              "sales_order_items.product",
+              "sales_order_items.unit",
+              "customs_detail"
+            ]
           ]
         end
       end
@@ -17,8 +29,15 @@ module Comee
       def show
         super do
           [
-            SalesOrder.includes(:customer_order, :client, sales_order_items: :unit).find(params[:id]),
-            fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
+            SalesOrder.includes(:customer_order, :client, :customs_detail, sales_order_items: :unit).find(params[:id]),
+            fields: [
+              "client",
+              "customer_order",
+              "sales_order_items",
+              "sales_order_items.product",
+              "sales_order_items.unit",
+              "customs_detail"
+            ]
           ]
         end
       end
@@ -33,9 +52,13 @@ module Comee
         data = SalesOrder.includes(
           :customer_order,
           :client,
+          :customs_detail,
           sales_order_items: :unit
         ).ransack(params[:q]).result
-        render_content(data, fields: ["client", "customer_order", "sales_order_items.product", "sales_order_items.unit"])
+        render_content(
+          data,
+          fields: ["client", "customer_order", "sales_order_items.product", "sales_order_items.unit", "customs_detail"]
+        )
       end
 
       def submit

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class Client < ApplicationRecord
+      before_save -> { self.subsidiary = !parent.nil? }
+
       belongs_to :user, optional: true
       belongs_to :parent, class_name: "Comee::Core::Client", optional: true
       belongs_to :currency, optional: true
@@ -22,6 +24,7 @@ module Comee
           name
           locale
           parent_id
+          subsidiary
         ]
       end
 

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

@@ -6,6 +6,7 @@ module Comee
       belongs_to :product
       belongs_to :supplier
       belongs_to :product_lookup
+      belongs_to :unit
     end
   end
 end

data/db/migrate/20240315163900_add_subsidiary_to_client.rb

@@ -0,0 +1,5 @@
+class AddSubsidiaryToClient < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_clients, :subsidiary, :boolean, default: false
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.31".freeze
+    VERSION = "0.2.33".freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     consignees { [] }
     shipment_addresses { [] }
     currency
+    subsidiary { false }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.33
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -442,6 +442,7 @@ files:
 - db/migrate/20240303191625_add_amount_paid_field_to_invoice.rb
 - db/migrate/20240314111117_create_comee_core_purchase_requisitions.rb
 - db/migrate/20240314111307_create_comee_core_purchase_requisition_items.rb
+- db/migrate/20240315163900_add_subsidiary_to_client.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb