comee_core 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 904aacbb433502ee95c7973c9ff1f50d5fe9698998a7600dcb84a038068f5125
-  data.tar.gz: a943ec5bd2893b7d1cff862f12695f193013740ff3c09606320306dbd252e2a6
+  metadata.gz: 6d50f09b407c09781cabe411155b912767ec73af304b20810a58a9632eb13e46
+  data.tar.gz: e0e7bb2f1540a1b922088327e04786589da49cf8b6f9f3e5e37d172a5f462643
 SHA512:
-  metadata.gz: c14eda451d86694be060e733b8fdc3cf903872faf587b9c74349663bf0badb23ae6cb8dfc7103b8109ea5da3e457eb36b1b6a0b7cb4773697899d144ca0abed1
-  data.tar.gz: ad1835d0bf82d0002b9f710b5f7439cb218abf4223cbbfa46229d1793e7f6f806107deb2a8334906ca7e4a5d2259d7c80497ea006f980d2d3c6475db9ecf5e2d
+  metadata.gz: 1ce44d97aed3a16468341eeda2d707d93c92c776a062491ecb204327b9877892bc812b5ab5e9bc6ba655f25e3f16aa710da2bde7104b624bff07948e29eeeac8
+  data.tar.gz: 193244d3ff7f49f941cfa77c3165af55180437ad3b2837fe358e42aebe62072259e1d91a6ae9623fc250477a146081a072946ad131b153ea723c54c3b9822cb4

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

@@ -0,0 +1,24 @@
+module Comee
+  module Core
+    class AdditionalServicesController < ApplicationController
+      include Common
+
+      def index
+        super do
+          AdditionalService.where(sales_order_id: params[:id])
+        end
+      end
+
+      def filter
+        services = AdditionalService.includes(:sales_order).ransack(params[:q]).result
+        render_content(services)
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:sales_order_id, :name, :unit, :quantity, :price)
+      end
+    end
+  end
+end

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

@@ -125,7 +125,7 @@ module Comee
                                         :client_id, :order_terms, :shipment_address, :delivery_address, :invoice_address,
                                         :destination, :handover_date, :shipping_date, :delivery_date, :consignee, :payment_term,
                                         :delivery_term, :payment_penalty, :status, :purchase_status, :total_price, :amount_paid,
-                                        :pallete_note, :remark, files: [])
+                                        :consolidator_date, :voyage_no, :shipping_arrangement, :pallete_note, :remark, files: [])
       end
 
       def back_order_params

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

@@ -0,0 +1,30 @@
+module Comee
+  module Core
+    class AdditionalService < ApplicationRecord
+      before_save :calculate_total_price
+      after_save :update_sales_order
+
+      belongs_to :sales_order
+
+      validates :name, :unit, presence: true
+      validates :quantity, :price, presence: true, numericality: {greater_than: 0}
+
+      def calculate_total_price
+        self.total_price = (price * quantity).round(2)
+      end
+
+      def update_sales_order
+        sales_order.calculate_total_price
+        sales_order.calculate_vat
+      end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id name sales_order_id]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[sales_order]
+      end
+    end
+  end
+end

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

@@ -1,14 +1,18 @@
 module Comee
   module Core
     class CustomerOrder < ApplicationRecord
+      OWN = "Own".freeze
+      AGENT = "Agent".freeze
+      SHIPPING_ARRANGEMENTS = [OWN, AGENT].freeze
+
       belongs_to :client
       has_many :customer_order_items
       has_one_attached :file
 
       enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, accepted: 3, canceled: 4}
-      enum :shipping_arrangement, {own: 0, agent: 1}
 
       validates :order_number, :order_date, :delivery_address, :invoice_address, :status, presence: true
+      validates :shipping_arrangement, inclusion: {in: SHIPPING_ARRANGEMENTS}, allow_nil: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[id client_id delivery_address invoice_address order_number status final_destination consignee]

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

@@ -1,6 +1,10 @@
 module Comee
   module Core
     class SalesOrder < ApplicationRecord
+      OWN = "Own".freeze
+      AGENT = "Agent".freeze
+      SHIPPING_ARRANGEMENTS = [OWN, AGENT].freeze
+
       before_validation :generate_order_number, if: proc { |so| so.order_number.nil? }
 
       before_save :set_parent_client_name
@@ -9,17 +13,17 @@ module Comee
       belongs_to :fulfillment_center, optional: true
       belongs_to :client
       has_many :sales_order_items
+      has_many :additional_services
       has_many_attached :files
       has_one :customs_detail
 
       enum :status, {draft: 0, submitted: 1, confirmed: 2, accepted: 3, canceled: 4}
       enum :purchase_status, {unprocessed: 0, processed: 1}
-      enum :shipping_arrangement, {own: 0, agent: 1}
 
       validates :order_number, presence: true, uniqueness: true
       validates :order_date, :status, :purchase_status, presence: true
       validates :payment_penalty, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}, allow_nil: true
-
+      validates :shipping_arrangement, inclusion: {in: SHIPPING_ARRANGEMENTS}, allow_nil: true
       validates :amount_paid,
                 presence: true,
                 numericality: {greater_than_or_equal_to: 0},
@@ -27,12 +31,17 @@ module Comee
 
       def calculate_total_price
         sales_order_items = SalesOrderItem.where(sales_order_id: id)
-        self.total_price = sales_order_items.sum(&:total_price)
+        additional_services = AdditionalService.where(sales_order_id: id)
+        self.total_price = sales_order_items.sum(&:total_price) + additional_services.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"
+        return unless client.tax_code == "Inland"
+
+        sales_order_items = SalesOrderItem.where(sales_order_id: id)
+        additional_services = AdditionalService.where(sales_order_id: id)
+        total_price = sales_order_items.sum(&:total_price) + additional_services.sum(&:total_price)
+        self.vat = (total_price * 0.19).round(2)
       end
 
       def set_parent_client_name

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

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class AdditionalServiceSerializer < ActiveModel::Serializer
+      attributes :id, :sales_order_id, :name, :unit, :quantity, :price, :total_price, :sales_order_id
+
+      belongs_to :sales_order
+    end
+  end
+end

data/config/routes.rb

@@ -147,9 +147,16 @@ Comee::Core::Engine.routes.draw do
       post "filter"
     end
   end
-  post "/sales_orders/filter", controller: :sales_orders, action: :filter
+
+  resources :additional_services do
+    collection do
+      post "filter"
+    end
+  end
+
   resources :sales_orders do
     collection do
+      post "filter"
       post "create_back_order", action: :create_back_order
     end
     member do
@@ -158,6 +165,7 @@ Comee::Core::Engine.routes.draw do
       post "confirm"
       post "accept"
       post "cancel"
+      get "services", controller: :additional_services, action: :index
     end
   end
 

data/db/migrate/20240629065810_remove_address_field_from_supplier_and_client.rb

@@ -2,6 +2,6 @@ class RemoveAddressFieldFromSupplierAndClient < ActiveRecord::Migration[7.1]
   def change
     remove_column :comee_core_clients, :address, :string
     remove_column :comee_core_suppliers, :address, :string
-    remove_column :comee_core_clients, :shipment_addresses, array: true
+    remove_column :comee_core_clients, :shipment_addresses, :string, array: true
   end
 end

data/db/migrate/20240629135249_add_additional_fields_to_order.rb

@@ -4,7 +4,7 @@ class AddAdditionalFieldsToOrder < ActiveRecord::Migration[7.1]
     add_column :comee_core_sales_orders, :consolidator_date, :date
     add_column :comee_core_customer_orders, :voyage_no, :string
     add_column :comee_core_sales_orders, :voyage_no, :string
-    add_column :comee_core_customer_orders, :shipping_arrangement, :integer
-    add_column :comee_core_sales_orders, :shipping_arrangement, :integer
+    add_column :comee_core_customer_orders, :shipping_arrangement, :string
+    add_column :comee_core_sales_orders, :shipping_arrangement, :string
   end
 end

data/db/migrate/20240630122016_create_comee_core_additional_services.rb

@@ -0,0 +1,17 @@
+class CreateComeeCoreAdditionalServices < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_additional_services do |t|
+      t.references :sales_order,
+                   null: false,
+                   index: {name: "so_on_ccas_indx"},
+                   foreign_key: {to_table: :comee_core_sales_orders}
+      t.string :name, null: false
+      t.float :quantity, null: false
+      t.string :unit, null: false
+      t.float :price, null: false
+      t.float :total_price, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

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

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :additional_service, class: "Comee::Core::AdditionalService" do
+    name { Faker::Lorem.sentence }
+    quantity { 1 }
+    unit { "pc" }
+    price { 100 }
+    total_price { quantity * price }
+    sales_order
+  end
+end

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

@@ -15,6 +15,6 @@ FactoryBot.define do
     status { 0 }
     consolidator_date { Date.current }
     voyage_no { Faker::Alphanumeric.alpha(number: 10) }
-    shipping_arrangement { Comee::Core::CustomerOrder.shipping_arrangements[:own] }
+    shipping_arrangement { Comee::Core::CustomerOrder::OWN }
   end
 end

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

@@ -21,7 +21,7 @@ FactoryBot.define do
     status { Comee::Core::SalesOrder.statuses[:draft] }
     consolidator_date { Date.current }
     voyage_no { Faker::Alphanumeric.alpha(number: 10) }
-    shipping_arrangement { Comee::Core::SalesOrder.shipping_arrangements[:own] }
+    shipping_arrangement { Comee::Core::SalesOrder::OWN }
     purchase_status { Comee::Core::SalesOrder.purchase_statuses[:unprocessed] }
     total_price { 0 }
     amount_paid { 0 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Henock L.
@@ -279,6 +279,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/comee/core/access_controller.rb
+- app/controllers/comee/core/additional_services_controller.rb
 - app/controllers/comee/core/agents_controller.rb
 - app/controllers/comee/core/application_controller.rb
 - app/controllers/comee/core/application_modules_controller.rb
@@ -323,6 +324,7 @@ files:
 - app/mailers/comee/core/notification_mailer.rb
 - app/mailers/comee/core/supplier_mailer.rb
 - app/models/comee/core/additional_item.rb
+- app/models/comee/core/additional_service.rb
 - app/models/comee/core/address.rb
 - app/models/comee/core/agent.rb
 - app/models/comee/core/application_module.rb
@@ -394,6 +396,7 @@ files:
 - app/models/comee/core/user.rb
 - app/models/comee/core/user_application_role.rb
 - app/notifications/comee/core/back_order_notification.rb
+- app/serializers/comee/core/additional_service_serializer.rb
 - app/serializers/comee/core/agent_serializer.rb
 - app/serializers/comee/core/application_module_serializer.rb
 - app/serializers/comee/core/client_address_serializer.rb
@@ -528,12 +531,14 @@ files:
 - 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
+- db/migrate/20240630122016_create_comee_core_additional_services.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
 - lib/comee_core.rb
 - lib/tasks/comee_core_tasks.rake
 - spec/factories/comee/core/additional_items.rb
+- spec/factories/comee/core/additional_services.rb
 - spec/factories/comee/core/agents.rb
 - spec/factories/comee/core/application_modules.rb
 - spec/factories/comee/core/back_order_items.rb