comee_core 0.2.99 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f908a911b1098420945879d34cfcea3d9d2621d45558a771fc00523f90f5c9f
-  data.tar.gz: a5a0ba0c43e01acd881f85a99ac0913ce87863ead8528dc313095874e0af435d
+  metadata.gz: fc0763d813df0b1e3ddf87c6a4212f0c0bf6f85e60744ade8f1d216fb2eefb9e
+  data.tar.gz: 664f56499508ef5699bdeb95543f442d9dcc58f43d0cb05bdafa5eda0c4868a1
 SHA512:
-  metadata.gz: 2ecbb6029fd90d1238167c0d9f25e855bbe4564e444f5265c9fad5419d68cf42106bc9cebf9ed6ad1b378716bd44a8c7d2205a8c930512553b962d7d2b6227dd
-  data.tar.gz: 7a1532959dd4b0f75c9ede644ba2b5d8f2179328c7d6f4bce434a4e194e76062efe835f9c7824f1c6353b05dab7dee065df3610e82c50a8b52d6a1b11152c767
+  metadata.gz: 828cfd039c47d92f5cbb4c1039cb84006227a74e2dfc908b8003e9531eae83afb61f6d8fcac7ac3786b4b69199a36c68e31c53aa38684fcdbb29b7d259d241fb
+  data.tar.gz: 3876f53bbb1c93e16eeff25e49f9b8e6d398797bc553ffeaf76af572a277da90eded3932d41e813004d7d620d07b8fcf47623dbd207649d3d01b22183e43f55b

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

@@ -3,8 +3,26 @@ module Comee
     class UsersController < ApplicationController
       include Common
 
+      def change_password
+        @user = current_user
+        if @user.authenticate(change_password_params[:old_password])
+          if @user.update(password: change_password_params[:new_password],
+                          password_confirmation: change_password_params[:new_password_confirmation])
+            render json: @user, serializer: UserSerializer, status: :ok
+          else
+            render json: {errors: @user.errors.full_messages}, status: 422
+          end
+        else
+          render json: {error: "Old password is incorrect"}, status: :unauthorized
+        end
+      end
+
       private
 
+      def change_password_params
+        params.require(:payload).permit(:old_password, :new_password, :new_password_confirmation)
+      end
+
       def model_params
         params.require(:payload).permit(:name, :email, :active, :password, :password_confirmation)
       end

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

@@ -10,7 +10,7 @@ module Comee
       validates :order_number, :order_date, :delivery_address, :invoice_address, :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id client_id delivery_address invoice_address order_number status]
+        %w[id client_id delivery_address invoice_address order_number status final_destination consignee]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -41,6 +41,7 @@ module Comee
           status
           purchase_status
           consignee
+          destination
           customer_order_id
         ]
       end

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

@@ -3,7 +3,7 @@ module Comee
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
                  :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id,
-                 :total_price, :canceled, :processing_status
+                 :total_price, :canceled, :processing_status, :additional_details
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source

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

@@ -169,7 +169,18 @@ module Comee
             product_id: order_items.map(&:product_id),
             status: ClientPrice.statuses[:current]
           )
-          master_prices = MasterPrice.where(primary: true, status: Price.statuses[:current], product: order_items.map(&:product))
+          master_prices = MasterPrice.includes(:supplier).where(primary: true, status: Price.statuses[:current],
+                                                                product: order_items.map(&:product))
+          main_query = ProductLookup.includes(:itemable).where(itemable_type: "Comee::Core::Supplier")
+          queries = master_prices.each_with_object([]) do |obj, res|
+            res << {
+              product_id: obj.product_id,
+              itemable_id: obj.supplier_id
+            }
+          end
+          product_lookups = queries.inject(main_query) do |conditions, condition|
+            conditions.or(ProductLookup.where(condition))
+          end
           items = order_items.each_with_object([]) do |item, res|
             next if item.canceled?
 
@@ -178,13 +189,16 @@ module Comee
             quantity = convert_quantity(item.quantity, item.unit_id, unit_id)
             client_price = client_prices.find { |price| price.product_id == item.product_id }
             master_price = master_prices.find { |price| price.product_id == item.product_id }
-            if client_price
-              price = convert_price(client_price.price, client_price.unit_id, unit_id)
-            else
-              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, unit_id)
+            product_lookup = product_lookups.find do |lookup|
+              lookup.product_id == master_price.product_id && lookup.itemable_id == master_price.supplier_id
             end
+            raise(StandardError, "No primary supplier found for product #{item.customer_item_no}") unless master_price
+
+            price = if client_price
+                      convert_price(client_price.price, client_price.unit_id, unit_id)
+                    else
+                      convert_price(master_price.selling_price, master_price.unit_id, unit_id)
+                    end
 
             res << {
               sales_order_id: sales_order.id,
@@ -199,7 +213,13 @@ module Comee
               total_price: quantity * price,
               delivery_date: item.delivery_date,
               handover_date: order.handover_date,
-              lead_time: master_price&.lead_time
+              lead_time: master_price&.lead_time,
+              additional_details: {
+                supplier_id: master_price.supplier_id,
+                supplier_name: master_price.supplier.name,
+                supplier_item_no: product_lookup.code,
+                supplier_description: product_lookup.item_description
+              }
             }
           end
           SalesOrderItem.insert_all!(items)

data/config/routes.rb

@@ -83,7 +83,11 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :unit_conversions
-  resources :users
+  resources :users do
+    member do
+      patch "change_password"
+    end
+  end
   resources :client_addresses
   resources :clients do
     member do

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -41,6 +41,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :comment
       t.string :action_note
       t.integer :processing_status, null: false, default: 0
+      t.jsonb :additional_details, default: {}
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.99".freeze
+    VERSION = "0.3.1".freeze
   end
 end

metadata

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