comee_core 0.2.13 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4ecd52efb335b2688fb0fd381163d594b81de592ed48dcd5701ee28c00d10f
-  data.tar.gz: 53ef139383420c858b4ce5afcb52974af1051cdb2086a83bcd28256311724a76
+  metadata.gz: a835077ddca4d1e18a7323eb5b5c4931e6c4291b579ab478a06793f7d060dfa6
+  data.tar.gz: e7b43c8a64d10355d66d72300f372174af183236b06c8b47dc8a420006716e8f
 SHA512:
-  metadata.gz: aea590ef7c2567f4f8014bd7d18f4e77e81b735afb9fb64444d680b419d0548d20edbf62308d7f3bd5904fa4a225cabaf5b47649955934976183e6ffcb9a63e2
-  data.tar.gz: 1a44e91626c5e3c1b3d5d37574bea1ab19fbf10c2993a31436bede678660d96862f6029735b70988eebbb39107039fb843b0a1c58f29045b983a733eee4c4386
+  metadata.gz: d87b04dd5d821f3db3c2b8612ea66616ecc5f538ee5aefc6bb12fc667b6851d383c0deb97576fc96a8cc72a54e83d239db4a66536d74abd68e6ec6c115689f6f
+  data.tar.gz: e4175296aa08b7b02481dfe0e88351d8102595a5c5c238c5fc78d8b0056c62255b607c80653d944d66b825b88a1b392d3d1ced614462bc1d13a603c8b58f021b

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

@@ -9,6 +9,7 @@ module Comee
             :sales_order,
             :customer_order_item,
             :source,
+            :product,
             :unit
           ).where(sales_order_id: params[:id])
         end
@@ -16,7 +17,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[:unit_id])
         render json: {success: true, data: result}
       end
 
@@ -33,6 +34,10 @@ module Comee
 
       private
 
+      def suggest_params
+        params.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/controllers/comee/core/sales_orders_controller.rb

@@ -6,7 +6,7 @@ module Comee
 
       def index
         super do
-          data = SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items, :client).all
+          data = SalesOrder.includes(:customer_order, :client, sales_order_items: :unit).all
           [
             data,
             fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
@@ -18,8 +18,7 @@ module Comee
         data = SalesOrder.includes(
           :customer_order,
           :client,
-          :fulfillment_center,
-          :sales_order_items
+          sales_order_items: :unit
         ).ransack(params[:q]).result
         render_content(data)
       end

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

@@ -76,7 +76,9 @@ module Comee
         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)
+        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.15".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.15
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 2024-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers