comee_core 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fccced757308f5d37ae6c37658589adcec29908f57c7b7a81acdb91d6217f5d0
-  data.tar.gz: a7379fb00bd7183e62f2e9f0e9439fa589323b52bc352f6d81bbc7ac07786e3a
+  metadata.gz: 904aacbb433502ee95c7973c9ff1f50d5fe9698998a7600dcb84a038068f5125
+  data.tar.gz: a943ec5bd2893b7d1cff862f12695f193013740ff3c09606320306dbd252e2a6
 SHA512:
-  metadata.gz: 7aeaf156df4bf4e589437f6d9e52d656df42e1f4bee3b9fd1995be62d19c4d00f1d767dc718c658ea41ea5a1bee3f603cf0327dcf969aafd2e19f7253bd3ca95
-  data.tar.gz: 601e9df140aee781e209deae318c93bb850054855f5808f15842de1cf8d1b07ac86c096e3582b5c5befa86ae4bc72139f20a73e986e81c1f9a307b187c619318
+  metadata.gz: c14eda451d86694be060e733b8fdc3cf903872faf587b9c74349663bf0badb23ae6cb8dfc7103b8109ea5da3e457eb36b1b6a0b7cb4773697899d144ca0abed1
+  data.tar.gz: ad1835d0bf82d0002b9f710b5f7439cb218abf4223cbbfa46229d1793e7f6f806107deb2a8334906ca7e4a5d2259d7c80497ea006f980d2d3c6475db9ecf5e2d

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

@@ -31,7 +31,7 @@ module Comee
       end
 
       def model_params
-        params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id)
+        params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id, :aliases)
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Comee
 
       belongs_to :pod
       belongs_to :time_slot
+      belongs_to :agent, optional: true
+
       validates :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -9,7 +9,7 @@ module Comee
       validates :code, uniqueness: {scope: %i[product_id itemable_id itemable_type]}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id code item_description itemable_id itemable_type product_id]
+        %w[id code item_description itemable_id itemable_type product_id alias]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -3,7 +3,6 @@ module Comee
     class SalesOrder < ApplicationRecord
       before_validation :generate_order_number, if: proc { |so| so.order_number.nil? }
 
-      before_save :total_price
       before_save :set_parent_client_name
 
       belongs_to :customer_order
@@ -26,11 +25,16 @@ module Comee
                 numericality: {greater_than_or_equal_to: 0},
                 allow_nil: true
 
-      def total_price
+      def calculate_total_price
         sales_order_items = SalesOrderItem.where(sales_order_id: id)
         self.total_price = sales_order_items.sum(&:total_price)
       end
 
+      def calculate_vat
+        total_price = SalesOrderItem.where(sales_order_id: id).sum(&:total_price)
+        self.vat = (total_price * 0.19).round(2) if client.tax_code == "Inland"
+      end
+
       def set_parent_client_name
         self.parent_client_name = client.parent&.name
       end

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

@@ -5,7 +5,9 @@ module Comee
 
       before_save :calculate_total_price
       before_save :calculate_handover_date
+      after_save :update_sales_order
       after_save :update_sales_order_purchase_status, if: proc { |item| item.fully_processed? }
+      after_destroy :update_sales_order
 
       enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
 
@@ -34,6 +36,11 @@ module Comee
         self.total_price = (price * quantity).round(2)
       end
 
+      def update_sales_order
+        sales_order.calculate_total_price
+        sales_order.calculate_vat
+      end
+
       def quantity_remaining
         quantity - (quantity_delivered + quantity_canceled)
       end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ProductLookupSerializer < ActiveModel::Serializer
-      attributes :id, :code, :itemable_id, :itemable_type, :item_description
+      attributes :id, :code, :itemable_id, :itemable_type, :item_description, :aliases
       belongs_to :product
     end
   end

data/db/migrate/20240630063656_add_aliases_field_to_product_lookup.rb

@@ -0,0 +1,5 @@
+class AddAliasesFieldToProductLookup < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_product_lookups, :aliases, :string
+  end
+end

data/db/migrate/20240630083042_add_agent_to_pickup_schedule.rb

@@ -0,0 +1,8 @@
+class AddAgentToPickupSchedule < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :comee_core_pickup_schedules,
+                  :agent,
+                  index: {name: "agent_on_ccps_indx"},
+                  foreign_key: {to_table: :comee_core_agents}
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.5".freeze
+    VERSION = "0.3.6".freeze
   end
 end

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     truck_no { Faker::Alphanumeric.alpha(number: 10) }
     driver_license_no { Faker::Alphanumeric.alpha(number: 10) }
     plate_no { Faker::Alphanumeric.alpha(number: 10) }
+    agent
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     product
     itemable factory: :supplier
     item_description { Faker::Lorem.sentence }
+    aliases { nil }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Henock L.
@@ -526,6 +526,8 @@ files:
 - db/migrate/20240629145738_add_telephone_and_email_to_address.rb
 - db/migrate/20240629160357_add_more_address_fields_to_agent.rb
 - db/migrate/20240629170409_add_vat_to_sales_orders.rb
+- db/migrate/20240630063656_add_aliases_field_to_product_lookup.rb
+- db/migrate/20240630083042_add_agent_to_pickup_schedule.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb