cats_core 1.1.30 → 1.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13f0bbe36a351142a7de75a500557cc117ab5bbbefda056ed4d18e5e66daf5f4
-  data.tar.gz: 0a4e5382aaa43a8485b7db31121f1e0b5b524616e1404ed3ce9327d815e459fa
+  metadata.gz: 04aa5725df06bf149cf057515dd11ef721dc9511b9aa9555cd2dd311ad9e96ff
+  data.tar.gz: ec1393337a6276fec08d3897618bb2ed345f66dd027a8a07efc59544bcd326d6
 SHA512:
-  metadata.gz: c09413b96216242e58a76a65e923d9a32a244df5ec558123350a6b7e445fc378b8a8f1ea997f1998a145be4bb57571205d48232bf78c849d27ac3ac8b87ba50b
-  data.tar.gz: b026966a9a06fba9e3f37308528957d6011d89bbf4f403a93e31e7586c1fa78514da27515c1ba4a9a92ded6a2c08eec9a43e0a563b90f11dd1a912537dcba151
+  metadata.gz: d5b97bdff8990988dd0bebeba15e24fadc28328970e1343f36617c3ee93a149af2470320ad8b7adafca36dcfddcb927acbed34e67b325dbb3828e2941ab5f9cc
+  data.tar.gz: ec0011655502fd35e6313bd4e5f079557cc58de783d093d640e122fbcd894bbcca459225ebafdc83f7c4c2770a116477dd4f09061ee33c5fadeee0e32790445d

data/app/controllers/cats/core/access_controller.rb

@@ -20,7 +20,7 @@ module Cats
             jwt = Cats::Core::TokenAuthService.issue(payload)
             render json: { token: jwt, user: payload }
           else
-            rener json: { error: 'Invalid username or password.' }, status: 400
+            render json: { error: 'Invalid username or password.' }, status: 400
           end
         else
           render json: { error: 'User does not exist.' }, status: 400

data/app/models/cats/core/hrp.rb

@@ -3,7 +3,9 @@ module Cats
     class Hrp < ApplicationRecord
       DRAFT = 'Draft'.freeze
       APPROVED = 'Approved'.freeze
-      STATUSES = [DRAFT, APPROVED].freeze
+      NEEDS_APPROVED = 'Needs Approved'.freeze
+
+      STATUSES = [DRAFT, APPROVED, NEEDS_APPROVED].freeze
 
       BELG = 'Belg'.freeze
       MEHER = 'Meher'.freeze

data/app/models/cats/core/stack.rb

@@ -20,7 +20,7 @@ module Cats
       validates :commodity_status, inclusion: { in: Cats::Core::Commodity::COMMODITY_STATUSES }
       validates :stack_status, inclusion: { in: STACK_STATUSES }
       validate :validate_coordinates, :validate_dimensions, :validate_distance_from_wall, :validate_overlap,
-               :validate_space_between_stack
+               :validate_space_between_stack, unless: -> { store && store.code == 'SUP-STORE' }
 
       after_save :update_store_space
 

data/app/notifications/cats/core/allocation_notification.rb

@@ -0,0 +1,29 @@
+# To deliver this notification:
+#
+# AllocationNotification.with(post: @post).deliver_later(current_user)
+# AllocationNotification.with(post: @post).deliver(current_user)
+
+module Cats
+  module Core
+    class AllocationNotification < Noticed::Base
+      deliver_by :database
+
+      param :allocation_item
+
+      def message
+        allocation_item = params[:allocation_item]
+        commodity = allocation_item.allocation.commodity.name
+        title = "Allocation Notification - #{commodity}"
+        date = Date.today
+        body = <<~BODY
+          Commodity with the following specification has been allocated to you:
+              Batch No. = #{allocation_item.allocation.commodity.batch_no}
+              Commodity = #{commodity}
+              Quantity = #{allocation_item.quantity}
+          The commodity is expected to be delivered from #{allocation_item.from} to #{allocation_item.to}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

data/app/notifications/cats/core/dispatch_notification.rb

@@ -7,13 +7,14 @@ module Cats
 
       def message
         dispatch = params[:dispatch]
-        title = 'Dispatch Notification'
+        commodity = dispatch.allocation_item.allocation.commodity.name
+        title = "Dispatch Notification - #{commodity}"
         date = Date.today
         body = <<~BODY
           Commodity with the following details has been dispatched to you:
               Dispatch Ref. = #{dispatch.reference_no}
               Batch No. = #{dispatch.allocation_item.allocation.commodity.batch_no}
-              Commodity = #{dispatch.allocation_item.allocation.commodity.name}
+              Commodity = #{commodity}
               Allocated Quantity = #{dispatch.allocation_item.quantity}
               Quantity = #{dispatch.quantity}
               Truck Plate No. = #{dispatch.plate_no}

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.30'.freeze
+    VERSION = '1.1.34'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.30
+  version: 1.1.34
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -286,6 +286,7 @@ files:
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
+- app/notifications/cats/core/allocation_notification.rb
 - app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb