comee_core 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4ecd52efb335b2688fb0fd381163d594b81de592ed48dcd5701ee28c00d10f
-  data.tar.gz: 53ef139383420c858b4ce5afcb52974af1051cdb2086a83bcd28256311724a76
+  metadata.gz: dac759817de32ff973fe059159a63dd455821779c29124d8cc40763ee85e37f1
+  data.tar.gz: b848191c7faf98be197912ef1709617441aa229e501d09051d2cf05a3255e9a9
 SHA512:
-  metadata.gz: aea590ef7c2567f4f8014bd7d18f4e77e81b735afb9fb64444d680b419d0548d20edbf62308d7f3bd5904fa4a225cabaf5b47649955934976183e6ffcb9a63e2
-  data.tar.gz: 1a44e91626c5e3c1b3d5d37574bea1ab19fbf10c2993a31436bede678660d96862f6029735b70988eebbb39107039fb843b0a1c58f29045b983a733eee4c4386
+  metadata.gz: 51f9017b7fe3286c0d6968f6e46c970d7dc4dbcb613ab74abdc14cbd1e4dadd97888a45facfdbb9e9bcdebc5c1c0cb981faf80cb0070a253ba848910582bfb07
+  data.tar.gz: b98b538ddb7c0ca35870d1bf03557f035aacc15315cd17ec6814e3082d4f2c37055ebef011286dc66821b1d58e461262bcd7cc630d677d32318ee772ebac54bd

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

@@ -16,7 +16,7 @@ module Comee
 
       def suggest_values
         service = CustomerOrderService.new
-        result = service.suggest_values(params[:id], params[:unit_id])
+        result = service.suggest_values(params[:id], suggest_params[:quantity], suggest_params[:unit_id])
         render json: {success: true, data: result}
       end
 
@@ -33,6 +33,10 @@ module Comee
 
       private
 
+      def suggest_params
+        params.require(:payload).permit(:unit_id, :quantity)
+      end
+
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
                                         :customer_item_no, :customer_item_description, :price, :handover_date, :delivery_date,

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

@@ -71,12 +71,14 @@ module Comee
         (quantity / conversion.factor).round
       end
 
-      def suggest_values(item_id, new_unit_id)
+      def suggest_values(item_id, new_quantity, new_unit_id)
         item = CustomerOrderItem.includes(:customer_order).find_by(id: item_id)
         raise(StandardError, "Order item with id `#{item_id}` not found.") unless item
 
-        quantity = convert_quantity(item.quantity, item.unit_id, new_unit_id)
-        client_price = ClientPrice.find_by(product_id: item.product_id, client_id: item.customer_order.client_id)
+        quantity = convert_quantity(new_quantity, item.unit_id, new_unit_id)
+        client = Client.find(item.customer_order.client_id)
+        client_id = client.parent_id || client.id
+        client_price = ClientPrice.find_by(product_id: item.product_id, client_id: client_id)
         if client_price
           price = convert_price(client_price.price, client_price.unit_id, new_unit_id)
         else

data/config/routes.rb

@@ -112,7 +112,7 @@ Comee::Core::Engine.routes.draw do
   end
   resources :sales_order_items, except: [:index] do
     member do
-      get "suggest", controller: :sales_order_items, action: :suggest_values
+      post "suggest", controller: :sales_order_items, action: :suggest_values
       post "cancel"
     end
   end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.13".freeze
+    VERSION = "0.2.14".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Henock L.