comee_core 0.1.51 → 0.1.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8507c4dd25c1bcfa029f438953fe12ec069c715c4bec5783f0653e4a87b77332
-  data.tar.gz: 474a2d3f78b9f0961130e2ace5dc66074b39d430c4c610b6b5a4ef0e2574c86b
+  metadata.gz: 738e68a65b4d7a96b3f0ea50a6e25da73e42d09f0ef888c49060a45ebc2fb39e
+  data.tar.gz: e42799a2bd3b0cfde406636e972ec258462df1df24dae8f4a051002eecc69294
 SHA512:
-  metadata.gz: e65a2a474b37e891703e2f55b6c763b3ba8510c243d6cf8266fa987b7949b487c8086a29c8b5d49fda223d406ed5b6ae552a30c82e8e07a38e80bcaa4e02884c
-  data.tar.gz: 6573cf6978274afeafb4467e74e9fe34340244bd08dca739115fd07fabca16974b083f100029ebb77534cabb686775bb586725aaee37e6ca9085b23bdd4001f3
+  metadata.gz: e680be5bdcf25fce5cd6fe5ee833c856fcf7eff59600b6cd8741a65d3713d36fd868bb6cac0bc25c2fe420c610ebce61617559b9da112ebdf214c818e5de407a
+  data.tar.gz: 343a4eff4586c0ea69d51960250a73766b710284c0f68724bbcb975f3b060080a288ca04e965dee8d7736d0e802af7fb3196f8f1ff841f494e9d5ec3cbd5fb40

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

@@ -27,7 +27,17 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:quantity, :price, :delivery_date, :canceled, :product_id, :customer_order_id, :unit_id)
+        params.require(:payload)
+              .permit(
+                :customer_item_no,
+                :quantity,
+                :price,
+                :delivery_date,
+                :canceled,
+                :product_id,
+                :customer_order_id,
+                :unit_id
+              )
       end
     end
   end

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

@@ -17,11 +17,25 @@ module Comee
         end
       end
 
+      def master_prices
+        data = MasterPrice.where(product_id: price_params[:product_ids])
+        render json: {success: true, data: serialize(data)}
+      end
+
+      def client_prices
+        data = ClientPrice.where(product_id: price_params[:product_ids])
+        render json: {success: true, data: serialize(data)}
+      end
+
       private
 
       def model_params
         params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, :preferred_units, images: [])
       end
+
+      def price_params
+        params.require(:payload).permit(product_ids: [])
+      end
     end
   end
 end

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

@@ -29,6 +29,7 @@ module Comee
       def model_params
         params.require(:payload)
               .permit(
+                :customer_item_no,
                 :price,
                 :quantity,
                 :discount,

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

@@ -52,10 +52,19 @@ module Comee
         render json: {success: false, error: e.message}
       end
 
+      def convert
+        service = QuotationRequestService.new
+        order = service.convert_to_order(params[:id])
+        render json: {success: true, data: serialize(order)}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       private
 
       def model_params
-        params.require(:payload).permit(:reference_no, :status, :client_id)
+        params.require(:payload)
+              .permit(:reference_no, :order_number, :order_date, :delivery_address, :invoice_address, :status, :client_id)
       end
 
       def rfq_params

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

@@ -7,7 +7,7 @@ module Comee
 
       enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, accepted: 3, canceled: 4}
 
-      validates :order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, presence: true
+      validates :order_number, :order_date, :delivery_address, :invoice_address, :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[client_id delivery_address invoice_address order_number status]

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

@@ -5,7 +5,7 @@ module Comee
       belongs_to :product
       belongs_to :unit
 
-      validates :quantity, :price, :delivery_date, presence: true
+      validates :customer_item_no, :quantity, :price, :delivery_date, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[customer_order_id product_id unit_id]

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

@@ -6,7 +6,7 @@ module Comee
       belongs_to :client
       has_many :quotation_request_items
 
-      enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, confirmed: 3}
+      enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, confirmed: 3, converted: 4}
 
       validates :status, presence: true
 

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class CustomerOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :quantity, :price, :delivery_date, :canceled
+      attributes :id, :customer_item_no, :quantity, :price, :delivery_date, :canceled
       belongs_to :product
       belongs_to :customer_order
       belongs_to :unit

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

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class MasterPriceSerializer < ActiveModel::Serializer
+      attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin
+      belongs_to :product
+      belongs_to :supplier
+    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, :price, :discount, :valid_from, :valid_to
+      attributes :id, :customer_item_no, :price, :discount, :valid_from, :valid_to
       belongs_to :product
       belongs_to :quotation_request
       belongs_to :unit

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class QuotationRequestSerializer < ActiveModel::Serializer
-      attributes :id, :reference_no, :status
+      attributes :id, :reference_no, :order_number, :status
       belongs_to :client
     end
   end

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

@@ -44,7 +44,7 @@ module Comee
                                     .or(UnitConversion.where("from_id = ? AND to_id = ?", new_unit_id, unit_id))
 
         unless conversions.count.positive?
-          units = Unit.where(id: [unit_id, new_unit_id]).select(:code)
+          units = Unit.where(id: [unit_id, new_unit_id])
           raise(StandardError, "There is no conversion factor between #{units[0].code} and #{units[1].code}.")
         end
 
@@ -112,7 +112,10 @@ module Comee
           raise(StandardError, "Customer order should be in submitted or awaiting confirmation state.")
         end
 
-        raise(StandardError, "Customer order does not have any items.") if order.customer_order_items.count.zero?
+        if order.customer_order_items.count.zero? ||
+           order.customer_order_items.all?(&:canceled?)
+          raise(StandardError, "Customer order does not have any items.")
+        end
 
         sales_order = nil
         CustomerOrder.transaction do

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

@@ -4,7 +4,14 @@ module Comee
       def create_request_with_items(params)
         request = nil
         QuotationRequest.transaction do
-          request = QuotationRequest.create!(client_id: params[:client_id], status: QuotationRequest.statuses[:draft])
+          request = QuotationRequest.create!(
+            client_id: params[:client_id],
+            status: QuotationRequest.statuses[:draft],
+            order_number: params[:order_number],
+            order_date: params[:order_date],
+            delivery_address: params[:delivery_address],
+            invoice_address: params[:invoice_address]
+          )
           items = params[:items]
           items.each do |item|
             item[:price] = 0
@@ -60,10 +67,69 @@ module Comee
           raise(StandardError, "RFQ should be in awaiting_confirmation state.")
         end
 
-        rfq.status = QuotationRequest.statuses[:confirmed]
-        rfq.save!
+        data = rfq.quotation_request_items.each_with_object([]) do |item, res|
+          res << {
+            client_id: rfq.client_id,
+            product_id: item.product_id,
+            unit_id: item.unit_id,
+            price: item.price,
+            discount: 0,
+            valid_from: item.valid_from,
+            valid_to: item.valid_to,
+            status: ClientPrice.statuses[:current]
+          }
+        end
+
+        ClientPrice.transaction do
+          ClientPrice.insert_all!(data)
+          rfq.status = QuotationRequest.statuses[:confirmed]
+          rfq.save!
+        end
         rfq
       end
+
+      def convert_to_order(id)
+        rfq = QuotationRequest.find(id)
+        if QuotationRequest.statuses[rfq.status] != QuotationRequest.statuses[:confirmed]
+          raise(StandardError, "RFQ should be in confirmed state for conversion to order.")
+        end
+
+        if rfq.quotation_request_items.any? { |item| item.customer_item_no.nil? }
+          raise(StandardError, "All RFQ items should have customer item number set.")
+        end
+
+        order = nil
+        CustomerOrder.transaction do
+          order = CustomerOrder.create!(
+            order_number: rfq.order_number,
+            order_date: Date.current,
+            client_id: rfq.client_id,
+            order_terms: "",
+            delivery_address: rfq.delivery_address,
+            invoice_address: rfq.invoice_address,
+            status: CustomerOrder.statuses[:draft]
+          )
+
+          items = rfq.quotation_request_items.each_with_object([]) do |item, res|
+            res << {
+              customer_order_id: order.id,
+              product_id: item.product_id,
+              unit_id: item.unit_id,
+              customer_item_no: item.customer_item_no,
+              quantity: item.quantity,
+              price: item.price,
+              delivery_date: item.expected_delivery_date,
+              canceled: false
+            }
+          end
+
+          CustomerOrderItem.insert_all!(items)
+          rfq.status = QuotationRequest.statuses[:converted]
+          rfq.save!
+        end
+
+        order
+      end
     end
   end
 end

data/config/routes.rb

@@ -9,7 +9,12 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :suppliers
-  resources :products
+  resources :products do
+    collection do
+      post "master_prices"
+      post "client_prices"
+    end
+  end
   resources :lookups
   resources :quotation_requests do
     collection do
@@ -20,6 +25,7 @@ Comee::Core::Engine.routes.draw do
       post "submit"
       post "submit_for_confirmation"
       post "confirm"
+      post "convert"
     end
   end
   resources :quotation_request_items do

data/db/migrate/20230811083239_create_comee_core_customer_orders.rb

@@ -7,7 +7,7 @@ class CreateComeeCoreCustomerOrders < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "client_on_cccuo_indx"},
                    foreign_key: {to_table: :comee_core_clients}
-      t.string :order_terms, null: false
+      t.string :order_terms
       t.string :delivery_address, null: false
       t.string :invoice_address, null: false
       t.integer :status, null: false, default: 0

data/db/migrate/20230811102708_create_comee_core_customer_order_items.rb

@@ -13,6 +13,7 @@ class CreateComeeCoreCustomerOrderItems < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "unit_on_cccuoi_indx"},
                    foreign_key: {to_table: :comee_core_units}
+      t.string :customer_item_no, null: false
       t.float :quantity, null: false, default: 0
       t.float :price, null: false, default: 0
       t.date :delivery_date, null: false

data/db/migrate/20231121094339_create_comee_core_quotation_requests.rb

@@ -2,6 +2,10 @@ class CreateComeeCoreQuotationRequests < ActiveRecord::Migration[7.1]
   def change
     create_table :comee_core_quotation_requests do |t|
       t.string :reference_no, null: false
+      t.string :order_number, null: false
+      t.date :order_date, null: false
+      t.string :delivery_address, null: false
+      t.string :invoice_address, null: false
       t.references :client,
                    null: false,
                    index: {name: "client_on_ccrfq_indx"},

data/db/migrate/20231121132709_create_comee_core_quotation_request_items.rb

@@ -9,6 +9,7 @@ class CreateComeeCoreQuotationRequestItems < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "rfq_on_ccrfqi_indx"},
                    foreign_key: {to_table: :comee_core_quotation_requests}
+      t.string :customer_item_no
       t.float :quantity, null: false
       t.float :price, null: false, default: 0
       t.float :discount, null: false, default: 0

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.51".freeze
+    VERSION = "0.1.53".freeze
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     customer_order
     product
     unit
+    customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     quantity { 1 }
     price { 1.5 }
     delivery_date { Date.current }

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     product
     quotation_request
     unit
+    customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     quantity { 10 }
     price { 0 }
     discount { 0 }

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

@@ -1,6 +1,10 @@
 FactoryBot.define do
   factory :quotation_request, class: "Comee::Core::QuotationRequest" do
     reference_no { "RFQ-#{client.code}-#{DateTime.now.to_i}" }
+    order_number { Faker::Alphanumeric.alpha(number: 10) }
+    order_date { Date.current }
+    delivery_address { Faker::Address.street_address }
+    invoice_address { Faker::Address.street_address }
     client
     status { 0 }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.53
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -353,6 +353,7 @@ files:
 - app/serializers/comee/core/external_rfq_serializer.rb
 - 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_serializer.rb
 - app/serializers/comee/core/product_type_serializer.rb
 - app/serializers/comee/core/purchase_order_item_serializer.rb