comee_core 0.1.87 → 0.1.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd01686f33365c1ac6f9b6a0263da7df0d5952a4b7aa6a65f330d57fed4d6c3
-  data.tar.gz: eb7d575093c1faf0a60d3a16eff3d00049d23c689ac5701c0a019599b5397fbb
+  metadata.gz: d2215fbbb3c1a9e0c836eb20902ea9c9871e473d08bb17c0659ca6c20236daeb
+  data.tar.gz: a546d3c21ef0b354c9ff61159309919145de3335e16639d9674a6ae1f2414824
 SHA512:
-  metadata.gz: 5deb9e48f2e06484c6a695d4395cb0b0053925657d92854f9194aafb63ca5c7504871689a6c22a7bf71841eb04901d897a0ab7da0b235ccf4ef655d56f934117
-  data.tar.gz: 0bce465e2462ad3c330a7ca0c80f2bd17166d58373abd6d9552dda3df5101885f787696fa03c9228748403b3220582e7ef0b0f11180e6bd87ddef70309820af4
+  metadata.gz: e00d19d0c5d47518505c4a4b5f7ef3a336807966795d933cff8ce7f133dfe32aebc50d76cb2d8dbd78b1010e89d271be9cf3dd6d1b30175b1405f50024108559
+  data.tar.gz: 5a9d63dd29c4ec4ed87b555dc7cb7b316d1fb69f97dbbc59f14dbc6cc638fd34ca0291103cb355078903276963911bd7953be094daeb3be86fd91157c7fc4039

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

@@ -25,39 +25,12 @@ module Comee
         render json: {success: true}
       end
 
-      # def filter_with_status
-      #   items = SalesOrderItem.includes(:sales_order, :product, :unit)
-      #                         .ransack(params[:q]).result
-      #   statuses = ItemStatus.where(sales_order_item_id: items.map(&:id))
-      #                        .select("MAX(id) AS max_id, sales_order_item_id")
-      #                        .group(:sales_order_item_id)
-      #                        .all
-      #   ids = statuses.map(&:max_id)
-      #   statuses = ItemStatus.where(id: ids).each_with_object({}) { |status, res| res[status.sales_order_item_id] = status }
-      #   result = items.each_with_object([]) do |item, res|
-      #     status = statuses[item.id]
-      #     data = {
-      #       sales_order_no: item.sales_order.order_number,
-      #       customer_item_no: item.customer_item_no,
-      #       product_code: item.product.code,
-      #       unit: item.unit.code,
-      #       quantity: item.quantity,
-      #       delivery_date: item.delivery_date,
-      #       handover_date: item.sales_order.handover_date,
-      #       po_reference: item.po_reference,
-      #       status: status&.status
-      #     }
-      #     res << data.merge(status&.details)
-      #   end
-      #   render json: {success: true, data: result}
-      # end
-
       private
 
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
-                                        :customer_item_no, :price, :delivery_date, :eb_number, :lead_time, :comment, :action_note,
-                                        :po_reference, :pallet_no, :source_id)
+                                        :customer_item_no, :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment,
+                                        :action_note, :po_reference, :pallet_no, :source_id)
       end
     end
   end

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

@@ -3,6 +3,11 @@ module Comee
     class UnitsController < ApplicationController
       include Common
 
+      def filter
+        units = Unit.ransack(params[:q]).result
+        render json: {success: true, data: serialize(units)}
+      end
+
       private
 
       def model_params

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class Pod < ApplicationRecord
       enum :status, {draft: 0, confirmed: 1, signed: 2}
+      has_many :shipment_instruction_items
 
       validates :reference_no, :status, presence: true
     end

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

@@ -1,8 +1,20 @@
 module Comee
   module Core
     class TransportAvailability < ApplicationRecord
+      before_save :compute_weekday
+
+      has_many :time_slots
+
       validates :availability_date, presence: true, uniqueness: true
-      validates :weekday, :weekday_short, presence: true
+
+      def compute_weekday
+        self.weekday = availability_date.strftime("%A")
+        self.weekday_short = availability_date.strftime("%a")
+      end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[availability_date weekday weekday_short]
+      end
     end
   end
 end

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

@@ -13,6 +13,10 @@ module Comee
 
         aliases.map(&:downcase!)
       end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[code name unit_type]
+      end
     end
   end
 end

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

@@ -1,8 +1,8 @@
 module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :lead_time, :comment,
-                 :action_note, :po_reference
+      attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :handover_date, :delivery_date, :eb_number,
+                 :lead_time, :comment, :action_note, :po_reference
 
       belongs_to :sales_order
       belongs_to :customer_order_item

data/config/routes.rb

@@ -66,7 +66,11 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :currencies
-  resources :units
+  resources :units do
+    collection do
+      post "filter"
+    end
+  end
   resources :unit_conversions
   resources :users
   post "/purchase_orders/filter", controller: :purchase_orders, action: :filter

data/config/spring.rb

@@ -1 +1 @@
-Spring.application_root = "spec/dummy"
+Spring.application_root = "./spec/dummy"

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.87".freeze
+    VERSION = "0.1.89".freeze
   end
 end

data/spec/factories/comee/core/transport_availabilities.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :transport_availability, class: "Comee::Core::TransportAvailability" do
     availability_date do
-      d = Date.current
+      d = Faker::Date.between(from: Date.current, to: Date.current.advance(months: 6))
       d.advance(days: 1) if d.wday == 7
       d.advance(days: 2) if d.wday == 6
       d

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.87
+  version: 0.1.89
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers