comee_core 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fab2298e1068d07c363f1b68294580c1083674dd2b8e39c138a9915a66e95c5
-  data.tar.gz: 28eee2c59364a03df98d8e8dcf64f5cd1077f6b1c3bd787a27c668ead48bbda2
+  metadata.gz: 4ef62a4650cf347d3276dede12a8c429757c5261df0697d3632a73b907c1c27a
+  data.tar.gz: 30d1511ab8a333c92730ccd98f16ced09d5c29aff58e7692fdbf908475ad2370
 SHA512:
-  metadata.gz: 786348f507b5a0c8ac4908c07fa36d946dbd938a56fdca4e2f197677532b8ceca183b8228d004ba2c43c825261542439921f26bb05b8221d63b7930fbd20ebb3
-  data.tar.gz: 3fe9e3c69f795418bcc608571c0ef8ea1270e0154d43dd7cf88481d00a527883786f8fe58d5ba3c05fd83fb5193251f5e91d5b51068bae3cded9e31c6d4d01f7
+  metadata.gz: e9d3e24823a44a19181692cb570c04bb78e7ff6632022fa1e76fbd5ef330bb06be7770c2589b49d19b6613d406199f81f5e6c4c9359675a18621a719d0b5224e
+  data.tar.gz: 28e92974cd248a841c25dac76b5dd93f89416159b16dde9778a1d51628daece86eb13d332965816e835ffce6550236bd8fc4bfd76b754ea0af43c4669957c099

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

@@ -52,7 +52,12 @@ module Comee
 
       def suggest_values
         service = CustomerOrderService.new
-        result = service.suggest_values(params[:id], suggest_params[:unit_id])
+        result = service.suggest_values(
+          params[:id],
+          suggest_params[:from_id],
+          suggest_params[:to_id],
+          suggest_params[:quantity]
+        )
         render json: {success: true, data: result}
       end
 
@@ -88,7 +93,7 @@ module Comee
       private
 
       def suggest_params
-        params.permit(:unit_id, :quantity)
+        params.permit(:from_id, :to_id, :quantity)
       end
 
       def model_params

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

@@ -79,23 +79,30 @@ module Comee
         (quantity / conversion.factor).round
       end
 
-      def suggest_values(item_id, new_unit_id)
-        item = CustomerOrderItem.includes(:customer_order).find_by(id: item_id)
+      def suggest_values(item_id, from_id, to_id, quantity, old_price = nil)
+        item = SalesOrderItem.includes(:product, sales_order: :client)
+                             .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 = Client.find(item.customer_order.client_id)
+        client = item.sales_order.client
         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
-          master_price = MasterPrice.find_by(product_id: item.product_id, primary: true)
-          raise(StandardError, "No price entry could be found for product `#{item.product.code}`.") unless master_price
-
-          price = convert_price(master_price.selling_price, master_price.unit_id, new_unit_id)
+
+        client_price = old_price
+        unless client_price
+          client_price = ClientPrice.find_by(product_id: item.product_id, client_id: client_id)
+          if client_price
+            client_price = convert_price(client_price.price, client_price.unit_id, from_id)
+          else
+            master_price = MasterPrice.find_by(product_id: item.product_id, primary: true)
+            raise(StandardError, "No price entry could be found for product `#{item.product.code}`.") unless master_price
+
+            client_price = convert_price(master_price.selling_price, master_price.unit_id, from_id)
+          end
         end
-        {quantity: quantity, price: price, total_price: quantity * price}
+
+        price = convert_price(client_price, from_id, to_id)
+        new_quantity = convert_quantity(quantity, from_id, to_id)
+        {quantity: new_quantity, price: price, total_price: (new_quantity * price).round(2)}
       end
 
       def submit(id)

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.21".freeze
+    VERSION = "0.3.22".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers