comee_core 0.1.51 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8507c4dd25c1bcfa029f438953fe12ec069c715c4bec5783f0653e4a87b77332
-  data.tar.gz: 474a2d3f78b9f0961130e2ace5dc66074b39d430c4c610b6b5a4ef0e2574c86b
+  metadata.gz: ff1dfff0aa073499bc32fea5072e424c330b9615d213dc26270262438b26e9e5
+  data.tar.gz: a87394329564dc44da058bbc4205f28abdb5a50e34d3ebe424cf2dc591877f87
 SHA512:
-  metadata.gz: e65a2a474b37e891703e2f55b6c763b3ba8510c243d6cf8266fa987b7949b487c8086a29c8b5d49fda223d406ed5b6ae552a30c82e8e07a38e80bcaa4e02884c
-  data.tar.gz: 6573cf6978274afeafb4467e74e9fe34340244bd08dca739115fd07fabca16974b083f100029ebb77534cabb686775bb586725aaee37e6ca9085b23bdd4001f3
+  metadata.gz: adf59f0b900a8d46b84a029c69208e71e135a2d9d8992f616474898129859178c1c524ec1558459ff8c0b43fcc4a685df54b2fd32b7855c98a580d3eb135617c
+  data.tar.gz: e93a6583da3c90075e23b7e71a488bae640908a8ee1281bab2db02157b7855bbca65a8151bec3bd7d494eace4aba3ae22dedc7178db21b178856f6d9efb84507

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/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/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

@@ -60,8 +60,24 @@ 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
     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

data/lib/comee/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.52
 platform: ruby
 authors:
 - Henock L.
@@ -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