cats_core 1.1.29 → 1.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb380491b61a7969316bce920572048d8654e059ea310880d6c7919ec3797dd9
-  data.tar.gz: 8650f299e8e221842a6c1c88b1e603e0b78acf709c8731b61743e82454d64e49
+  metadata.gz: cc7dd4f19838153db58356a4d33eb5f0fcff634279643a00e221084b170bd840
+  data.tar.gz: b423a14678d56634fb1b2d1f10ee7c9df20ef0129de0ac245b956a6943cf8029
 SHA512:
-  metadata.gz: 1700fa7100a312a136579defe9782a1c4a919c488cb44c25d899f1cfc72ce6ac94a50e677aa521c2b600fa672b44fe89213db5e947fefe77c24861686f75db3b
-  data.tar.gz: '08df5a63ebfa01ad0f2c47094b81d9fa0e2546b37ab5704e8882c09aa6ac949cee80682cf50a3dac84e52dd149ea9a0fb10f0e1b3d346968f8f5641bb16abb48'
+  metadata.gz: 1ebaeba514c4ebba0f6f3288efbadd58546cf94e5f5b1028808a037767c8b36df516b357ea404e1d7046fb26729334eed0d90c11b31fe267cff1f05ccf20b98e
+  data.tar.gz: 89514042663c0b651b09da15c7897e4c7f87b4a8df2648661181c692ea9b99b3c6575f4e592a595fe364e419ccc1175a1d08412a55d8d9a55231cbfe6de50943

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/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/app/serializers/cats/core/dispatch_transaction_serializer.rb

@@ -1,8 +1,8 @@
 module Cats
   module Core
     class DispatchTransactionSerializer < ActiveModel::Serializer
-      attributes :id, :source_id, :source_code, :destination_id, :destination_reference_no, :quantity, :transaction_date,
-                 :status
+      attributes :id, :source_id, :source_code, :destination_id, :destination_reference_no, :quantity,
+                 :transaction_date, :status
     end
   end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.29'.freeze
+    VERSION = '1.1.33'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.29
+  version: 1.1.33
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2021-10-22 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