comee_core 0.2.14 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dac759817de32ff973fe059159a63dd455821779c29124d8cc40763ee85e37f1
-  data.tar.gz: b848191c7faf98be197912ef1709617441aa229e501d09051d2cf05a3255e9a9
+  metadata.gz: 406c93dca731f87dea5f764260975fb10ea432aa054d6b619faaf0a4430af097
+  data.tar.gz: ca8d491fc263c2cd7abc3618f8dc1a54ff544137674936527ed3e2511c299033
 SHA512:
-  metadata.gz: 51f9017b7fe3286c0d6968f6e46c970d7dc4dbcb613ab74abdc14cbd1e4dadd97888a45facfdbb9e9bcdebc5c1c0cb981faf80cb0070a253ba848910582bfb07
-  data.tar.gz: b98b538ddb7c0ca35870d1bf03557f035aacc15315cd17ec6814e3082d4f2c37055ebef011286dc66821b1d58e461262bcd7cc630d677d32318ee772ebac54bd
+  metadata.gz: 9d77f8b9c8ab3e2dcf258faf3312a7f44698f608a7c59a7a024c3a361261b348f17c1868f7685579ffef5db0d63c1a76e95b2d81f8f1eca4c3cd2ef7216bbd37
+  data.tar.gz: c0ac3ee94586168c23566ca9ef133c4b092d66cf6ac764d152e1a5c8fb37f4ae051db50eaa4ab14f42efb7a4bb0198648a4e6d6a99c2f9fb60ce785f2f2b02c6

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], suggest_params[:quantity], suggest_params[:unit_id])
+        result = service.suggest_values(params[:id], suggest_params[:unit_id])
         render json: {success: true, data: result}
       end
 
@@ -34,7 +35,7 @@ module Comee
       private
 
       def suggest_params
-        params.require(:payload).permit(:unit_id, :quantity)
+        params.permit(:unit_id, :quantity)
       end
 
       def model_params

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).order(created_at: :desc)
           [
             data,
             fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
@@ -14,12 +14,20 @@ module Comee
         end
       end
 
+      def show
+        super do
+          [
+            SalesOrder.includes(:customer_order, :client, sales_order_items: :unit).find(params[:id]),
+            fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
+          ]
+        end
+      end
+
       def filter
         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/models/comee/core/user.rb

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class User < ApplicationRecord
-      enum :user_type, {supplier: 0, admin: 1, client: 2, worker: 3}
+      enum :user_type, {supplier: 0, admin: 1, client: 2, clerk: 3, order_manager: 4}
 
       has_secure_password
       has_many :notifications, as: :recipient, dependent: :destroy

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

@@ -71,11 +71,11 @@ module Comee
         (quantity / conversion.factor).round
       end
 
-      def suggest_values(item_id, new_quantity, new_unit_id)
+      def suggest_values(item_id, 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(new_quantity, item.unit_id, new_unit_id)
+        quantity = convert_quantity(item.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)

data/lib/comee/core/version.rb

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

metadata

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