comee_core 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 904aacbb433502ee95c7973c9ff1f50d5fe9698998a7600dcb84a038068f5125
-  data.tar.gz: a943ec5bd2893b7d1cff862f12695f193013740ff3c09606320306dbd252e2a6
+  metadata.gz: 9cf7c91a847172c08d9e35c46340095ff403ffb61939a5a7b69f830fa2394228
+  data.tar.gz: 55174a1b2a8a304b3ee99995b98efdd52557889b5d57b3623e016df11a29e34a
 SHA512:
-  metadata.gz: c14eda451d86694be060e733b8fdc3cf903872faf587b9c74349663bf0badb23ae6cb8dfc7103b8109ea5da3e457eb36b1b6a0b7cb4773697899d144ca0abed1
-  data.tar.gz: ad1835d0bf82d0002b9f710b5f7439cb218abf4223cbbfa46229d1793e7f6f806107deb2a8334906ca7e4a5d2259d7c80497ea006f980d2d3c6475db9ecf5e2d
+  metadata.gz: b1b2f94a733c313e13ff4ad02c1a2189561d21beef7be6c9cf9089e5320950811b4ddaddf51e7c50e54eefd2918793b3b57b22d1978007df27fcbf8955fdea80
+  data.tar.gz: c6e916957bae4a9f6b29643c2f92e73d362e62b74a84610d0d2750b3e0465b3c8d1f4dba000d8d74d83d147fafc58a25dded8755eac92ba3e2b5139d75cd7c6c

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/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/sales_order.rb

@@ -9,6 +9,7 @@ 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
 
@@ -27,12 +28,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/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.7".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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 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