comee_core 0.1.64 → 0.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cd6ae8953f0384e6621da475902a2cc7dbde2c84878da91a819a3bb4dd03ef
-  data.tar.gz: cffd56f30c07ea7030935b845baffc6285d0064e2cc6e5c7557bc7b4a39ce805
+  metadata.gz: 47cf5679d2c9d6fbc6d6f0c4f7eb3a6a25c402ec3e4aabf667de41c01b3e2f82
+  data.tar.gz: 3fc087959c16abb7bc68c36a0e8f126c21922545a6118d19203f8cb3d95e6e2d
 SHA512:
-  metadata.gz: 8d3565e8fad90e32587fafa45309b44faaeb04326aaf5ce108dbe4be90150858d40a88476c2b76fa4163552e6066ee05ec76fa3fd7698b8263661c5712e77f99
-  data.tar.gz: 4ee979f53c118c6c372d794657140d347b9177467ab3a041bb684e870f261b35b0511da3fc14c1a64923d5d18c98fa33d5e50a79aecdfc94dc436855fd46dc83
+  metadata.gz: f42d06b36fa70926e8cd3e0003522aecdad89a5c6a291fe39158beb29b9a769b03d35aa096e40db2bfdb7ff0d79e25538ee8b835e528bcf1b703f33af93fbff5
+  data.tar.gz: 33719ed3f0a29dd2f68e3c3192158c03a9f361ee62bc640264d385e7233642c4b376347656d71aa838b9aca1535fc1bf18d1f66280878f5efc0195b24e8c28ae

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

@@ -19,7 +19,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:valid_from, :valid_to, :price, :product_id, :discount, :client_id, :previous_price,
+        params.require(:payload).permit(:valid_from, :valid_to, :price, :product_id, :margin, :margin_type, :client_id, :previous_price,
                                         :unit_id)
       end
     end

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

@@ -0,0 +1,24 @@
+module Comee
+  module Core
+    class ProductLookupsController < ApplicationController
+      include Common
+
+      def index
+        super do
+          ProductLookup.includes(:product).all
+        end
+      end
+
+      def filter
+        lookups = ProductLookup.ransack(params[:q]).result
+        render json: {success: true, data: serialize(lookups)}
+      end
+
+      private
+
+      def model_params
+        params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id)
+      end
+    end
+  end
+end

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

@@ -32,7 +32,8 @@ module Comee
                 :customer_item_no,
                 :price,
                 :quantity,
-                :discount,
+                :margin,
+                :margin_type,
                 :valid_from,
                 :valid_to,
                 :product_id,

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

@@ -57,7 +57,7 @@ module Comee
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
                                         :customer_item_no, :price, :delivery_date, :eb_number, :lead_time, :comment, :action_note,
-                                        :po_reference, :source_id)
+                                        :po_reference, :pallet_no, :source_id)
       end
     end
   end

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

@@ -49,8 +49,9 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :status, :fulfillment_center_id,
-                                        :total_price, :amount_paid, :pallete_note, :handover_date, :remark, files: [])
+        params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :payment_term, :delivery_term, :status,
+                                        :fulfillment_center_id, :total_price, :amount_paid, :pallete_note, :handover_date, :remark,
+                                        files: [])
       end
 
       def back_order_params

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

@@ -15,7 +15,6 @@ module Comee
           address
           code
           name
-          discount
           locale
         ]
       end

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

@@ -1,13 +1,14 @@
 module Comee
   module Core
     class ClientPrice < Price
+      enum :margin_type, {increase: 0, discount: 1}
       belongs_to :client
       belongs_to :previous_price, class_name: "Comee::Core::ClientPrice", optional: true
       belongs_to :next_price, class_name: "Comee::Core::ClientPrice", optional: true
 
-      validates :price, presence: true
+      validates :price, :margin_type, presence: true
       validates :price, numericality: {greater_than: 0}
-      validates :discount, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
+      validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
       validates :product_id, uniqueness: {scope: %i[client_id previous_price_id next_price_id status]}
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -4,7 +4,11 @@ module Comee
       belongs_to :product
       belongs_to :itemable, polymorphic: true
 
-      validates :code, presence: true
+      validates :code, :item_description, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[code item_description itemable_id itemable_type product_id]
+      end
     end
   end
 end

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

@@ -1,14 +1,17 @@
 module Comee
   module Core
     class QuotationRequestItem < ApplicationRecord
+      enum :margin_type, {increase: 0, discount: 1}
       belongs_to :product
       belongs_to :quotation_request
       belongs_to :unit
 
-      validates :quantity, :price, :discount, :expected_delivery_date, presence: true
+      validates :margin_type, :expected_delivery_date, presence: true
+      validates :quantity, :price, presence: true, numericality: {greater_than_or_equal_to: 0}
+      validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[quotation_request_id product_id unit_id quantity price discount expected_delivery_date]
+        %w[quotation_request_id product_id unit_id quantity price margin margin_type expected_delivery_date]
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ClientPriceSerializer < ActiveModel::Serializer
-      attributes :id, :valid_from, :valid_to, :price, :status, :previous_price
+      attributes :id, :valid_from, :valid_to, :price, :status, :previous_price, :margin, :margin_type
       belongs_to :product
       belongs_to :client
       belongs_to :unit

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

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

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class QuotationRequestItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :price, :discount, :valid_from, :valid_to, :quantity, :expected_delivery_date
+      attributes :id, :customer_item_no, :price, :margin, :margin_type, :valid_from, :valid_to, :quantity, :expected_delivery_date
       belongs_to :product
       belongs_to :quotation_request
       belongs_to :unit

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

@@ -2,11 +2,12 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :lead_time, :comment,
-                 :action_note, :po_reference, :product, :unit
+                 :action_note, :po_reference, :pallet_no
 
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source
+      belongs_to :product
       belongs_to :unit
     end
   end

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

@@ -1,8 +1,8 @@
 module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
-      attributes :id, :order_number, :payment_penalty, :status, :total_price,
-                 :amount_paid, :pallete_note, :handover_date, :remark, :files_url
+      attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid, :pallete_note,
+                 :handover_date, :remark, :files_url
       belongs_to :customer_order
       belongs_to :fulfillment_center
       has_many :sales_order_items

data/app/services/comee/core/product_lookup_service.rb

@@ -21,7 +21,7 @@ module Comee
 
         if from == ORGANIZATION
           query = ProductLookup.joins(:product).find_by(product: {code: code}, **to)
-          return query.code
+          return query
         end
 
         if to == ORGANIZATION
@@ -30,8 +30,7 @@ module Comee
         end
 
         product = ProductLookup.find_by(code: code, **from).product
-        query = ProductLookup.find_by(product: product, **to)
-        query.code
+        ProductLookup.find_by(product: product, **to)
       end
     end
   end

data/app/services/comee/core/quotation_request_service.rb

@@ -16,7 +16,8 @@ module Comee
           items.each do |item|
             item[:price] = 0
             item[:quotation_request_id] = request.id
-            item[:discount] = 0
+            item[:margin] = 0
+            item[:margin_type] = QuotationRequestItem.margin_types[:increase]
           end
           QuotationRequestItem.insert_all!(items)
         end
@@ -73,7 +74,8 @@ module Comee
             product_id: item.product_id,
             unit_id: item.unit_id,
             price: item.price,
-            discount: 0,
+            margin: 0,
+            margin_type: QuotationRequestItem.margin_types[:increase],
             valid_from: item.valid_from,
             valid_to: item.valid_to,
             status: ClientPrice.statuses[:current]

data/config/routes.rb

@@ -15,6 +15,12 @@ Comee::Core::Engine.routes.draw do
       post "client_prices"
     end
   end
+  resources :product_lookups do
+    collection do
+      post "filter"
+    end
+  end
+
   resources :lookups
   resources :quotation_requests do
     collection do

data/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -9,7 +9,6 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
       t.string :name, null: false
       t.string :address, null: false
       t.string :locale, null: false, default: "en"
-      t.string :discount, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -10,6 +10,8 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "fc_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_fulfillment_centers}
+      t.string :payment_term
+      t.string :delivery_term
       t.float :payment_penalty, null: false, default: 0.0
       t.integer :status, null: false, default: 0
       t.float :total_price, null: false, default: 0

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -33,6 +33,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :comment
       t.string :action_note
       t.string :po_reference
+      t.string :pallet_no
 
       t.timestamps
     end

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -7,7 +7,7 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
       t.date :valid_to, null: false
       t.float :status, null: false, default: 0
       t.boolean :primary, null: false, default: false
-      t.integer :margin, null: false
+      t.float :margin, null: false, default: 0
       t.integer :lead_time
       t.references :product,
                    null: false,

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -5,7 +5,8 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
       t.date :valid_to, null: false
       t.float :price, null: false
       t.float :status, null: false, default: 0
-      t.integer :discount, null: false
+      t.float :margin, null: false, default: 0
+      t.integer :margin_type, null: false, default: 0
       t.references :product,
                    null: false,
                    index: {name: "product_on_cccp_indx"},

data/db/migrate/{20230914041307_create_comee_core_external_products.rb → 20230914041307_create_comee_core_product_lookups.rb}

@@ -1,8 +1,9 @@
-class CreateComeeCoreExternalProducts < ActiveRecord::Migration[7.0]
+class CreateComeeCoreProductLookups < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_product_lookups do |t|
       t.string :code, null: false
       t.references :itemable, polymorphic: true, null: false
+      t.string :item_description, null: false
       t.references :product,
                    null: false,
                    index: {name: "product_on_ccep_indx"},

data/db/migrate/20231121132709_create_comee_core_quotation_request_items.rb

@@ -12,7 +12,8 @@ class CreateComeeCoreQuotationRequestItems < ActiveRecord::Migration[7.1]
       t.string :customer_item_no
       t.float :quantity, null: false
       t.float :price, null: false, default: 0
-      t.float :discount, null: false, default: 0
+      t.float :margin, null: false, default: 0
+      t.integer :margin_type, null: false, default: 0
       t.date :expected_delivery_date, null: false
       t.boolean :canceled, null: false, default: false
       t.references :unit,

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.64".freeze
+    VERSION = "0.1.66".freeze
   end
 end

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

@@ -7,7 +7,8 @@ FactoryBot.define do
     product
     client
     unit
-    discount { 0 }
+    margin { 0.0 }
+    margin_type { Comee::Core::ClientPrice.margin_types[:increase] }
     previous_price { nil }
     next_price { nil }
 

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

@@ -5,6 +5,5 @@ FactoryBot.define do
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }
-    discount { 0 }
   end
 end

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

@@ -3,5 +3,6 @@ FactoryBot.define do
     code { Faker::Alphanumeric.alpha(number: 8) }
     product
     itemable factory: :supplier
+    item_description { Faker::Lorem.sentence }
   end
 end

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

@@ -6,7 +6,8 @@ FactoryBot.define do
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     quantity { 10 }
     price { 0 }
-    discount { 0 }
+    margin { 0 }
+    margin_type { Comee::Core::QuotationRequestItem.margin_types[:increase] }
     expected_delivery_date { Date.current.advance(days: 15) }
     canceled { false }
     valid_from { nil }

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

@@ -16,5 +16,6 @@ FactoryBot.define do
     comment { Faker::Lorem.sentence }
     action_note { Faker::Lorem.sentence }
     po_reference { Faker::Alphanumeric.alpha(number: 10) }
+    pallet_no { Faker::Alphanumeric.alpha(number: 10) }
   end
 end

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

@@ -3,6 +3,8 @@ FactoryBot.define do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
     customer_order
     fulfillment_center
+    payment_term { Faker::Lorem.sentence }
+    delivery_term { Faker::Lorem.sentence }
     payment_penalty { 0 }
     total_price { 0 }
     amount_paid { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.64
+  version: 0.1.66
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -291,6 +291,7 @@ files:
 - app/controllers/comee/core/item_statuses_controller.rb
 - app/controllers/comee/core/lookups_controller.rb
 - app/controllers/comee/core/notifications_controller.rb
+- app/controllers/comee/core/product_lookups_controller.rb
 - app/controllers/comee/core/products_controller.rb
 - app/controllers/comee/core/purchase_order_items_controller.rb
 - app/controllers/comee/core/purchase_orders_controller.rb
@@ -354,6 +355,7 @@ files:
 - app/serializers/comee/core/item_status_serializer.rb
 - app/serializers/comee/core/lookup_serializer.rb
 - app/serializers/comee/core/master_price_serializer.rb
+- app/serializers/comee/core/product_lookup_serializer.rb
 - app/serializers/comee/core/product_serializer.rb
 - app/serializers/comee/core/product_type_serializer.rb
 - app/serializers/comee/core/purchase_order_item_serializer.rb
@@ -396,7 +398,7 @@ files:
 - db/migrate/20230812212844_create_comee_core_sales_order_items.rb
 - db/migrate/20230813235946_create_comee_core_master_prices.rb
 - db/migrate/20230814151601_create_comee_core_client_prices.rb
-- db/migrate/20230914041307_create_comee_core_external_products.rb
+- db/migrate/20230914041307_create_comee_core_product_lookups.rb
 - db/migrate/20230915205522_create_comee_core_invoices.rb
 - db/migrate/20230915205648_create_comee_core_invoice_items.rb
 - db/migrate/20230929115336_create_comee_core_order_sources.rb