comee_core 0.2.60 → 0.2.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf2a038860b8510f876109ece2bd8b805b17f3daeb20c13cebfb9b5e9af3329c
-  data.tar.gz: 25517d12bce6ab946a9cbc2edc6102b34c5e9458c1197f661060c65b7f9523a7
+  metadata.gz: b3647a23605f256be409ffe92d604c6c3cf2145c59973380f73d38ac866b5249
+  data.tar.gz: e8ddef5687858b3b4c4f443e5f1f8235e7c3bf11c90b9b2270589855106a13e5
 SHA512:
-  metadata.gz: 692be3876a190479f7a2d0cecc6d8e5b9fbfeeb5cd936ed2db37e2035a6f0b907eb7979ccf47c29d1030009d939b4b6eb10e913036440ec03896bf3eff646321
-  data.tar.gz: 145d9b19082364fd6541a2a3456cbae38292854be28b5cdca125a3d65865f9a0121fa78799d5f7c164036b3905c5c3ca4bd19fa9b1808f82d03e796d91fe3fdb
+  metadata.gz: 29924b04d90bbd2daa6d4e59077713c42491b94dceaf98a351c94ea433f06af36e582600a775580cee02ba55d99f019d4a20ccec6eaf0fd3125a9f7cd40cc7c9
+  data.tar.gz: 91469b52049d64914608cd1b73e1ea2a0026a1b16486f7ba01691bbe6715e7a3b94eee935ef5a930b0fe4f5b97c92626e69b216875ba07fedcbeeb87d1fb4fc9

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

@@ -26,10 +26,15 @@ module Comee
           product_id = model_params[:product_id] || @obj.product_id
           master_price = MasterPrice.find_by(product_id: product_id, primary: true)
           @obj.price = master_price&.selling_price
+          @obj.valid_from = model_params[:valid_from] if model_params[:valid_from]
+          @obj.valid_to = model_params[:valid_to] if model_params[:valid_to]
+          @obj.margin = model_params[:margin] if model_params[:margin]
+          @obj.margin_type = model_params[:margin_type] if model_params[:margin_type]
           if @obj.price
             @obj.price = @obj.margin_increase? ? @obj.price * (1 + @obj.margin / 100) : @obj.price * (1 - @obj.margin / 100)
+            @obj.price = @obj.price.round(2)
           end
-          if @obj.update(model_params)
+          if @obj.save
             render_content(@obj)
           else
             render json: {success: false, error: @obj.errors.full_messages[0]}, status: :unprocessable_entity

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

@@ -34,7 +34,7 @@ module Comee
             :item_statuses
           ],
           sales_order: :fulfillment_center,
-          purchase_order_item: :purchase_order
+          purchase_order_item: [{purchase_order: :supplier}]
         ).find(params[:id])
         render_content(
           details,
@@ -42,7 +42,7 @@ module Comee
             include: [
               "shipment_items.shipment_instruction_items.pod",
               "shipment_items.item_statuses",
-              "purchase_order_item.purchase_order",
+              "purchase_order_item.purchase_order.supplier",
               "sales_order.fulfillment_center"
             ],
             serializer: SalesOrderItemDetailSerializer

data/app/models/comee/core/sales_order.rb

@@ -41,7 +41,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        []
+        ["client"]
       end
 
       def files_url

data/app/serializers/comee/core/purchase_order_serializer.rb

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class PurchaseOrderSerializer < ActiveModel::Serializer
+      attributes :id, :po_number, :supplier_id, :order_date, :status, :delivery_address, :delivery_date, :terms, :total_price,
+                 :created_at, :updated_at
+      belongs_to :supplier
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.60".freeze
+    VERSION = "0.2.62".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.60
+  version: 0.2.62
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -375,6 +375,7 @@ files:
 - app/serializers/comee/core/product_serializer.rb
 - app/serializers/comee/core/product_type_serializer.rb
 - app/serializers/comee/core/purchase_order_item_serializer.rb
+- app/serializers/comee/core/purchase_order_serializer.rb
 - app/serializers/comee/core/quotation_request_item_serializer.rb
 - app/serializers/comee/core/quotation_request_serializer.rb
 - app/serializers/comee/core/sales_order_item_detail_serializer.rb