comee_core 0.1.33 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89be0ab79ac6789639448aaafa19ca5845e08e132d0d99c34eef619b97ece546
-  data.tar.gz: f62cdbb0af85b33c2322d17d9289cdd12c2021cd28b1fa06332cc63c39847a01
+  metadata.gz: 13b98b025e67870310c1c5a59ed49190f520ac69c4f4f66d6d6e59c3887b0e56
+  data.tar.gz: 4403b249eb4659a7198c27d218b4df9d84bcd352933540f093f44d150f837e68
 SHA512:
-  metadata.gz: 5fca168ac18ac7ceef8614bdb8792f4395e21107cb62adfc9b9ac1d7b4301f8b418e3bdb5968f9b8fd4c4ebcebaf3517cb13fcda854ef1c36bb059943ac42b59
-  data.tar.gz: 6369177eb65524a12f58c1f2469b9fc3114a587edc0bdc7b6b64dc98e1655433910325fa4d3864fce8f861dbb866694f3079171e91f18d9a5d48c9d1c01a9e16
+  metadata.gz: 4070797618a46ce5da8102c5056c464bb688fc91fc802af00f9a6d8e3c5e24507bbd56fc4f9eeda2bbffa6c486cb0740b26a480ff01609f840fbad1efe47693c
+  data.tar.gz: ea97a4615f87b8ab8f1c6929d4c15c8c71f24229c58cf6cedbee93e19a9388b224763c2aa2ab0a4921d5456ae8fcd1d65964a07ece18a53f0dd1fe133a4897ed

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

@@ -18,7 +18,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:valid_from, :valid_to, :price, :status, :product_id, :discount, :client_id, :previous_price,
+        params.require(:payload).permit(:valid_from, :valid_to, :price, :product_id, :discount, :client_id, :previous_price,
                                         :unit_id)
       end
     end

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

@@ -15,8 +15,10 @@ module Comee
       def validate_primary_price
         return unless product && primary
 
-        count = MasterPrice.where(product: product, primary: true, status: Price.statuses[:current]).count
-        return unless count.positive? && primary && MasterPrice.statuses[status] == MasterPrice.statuses[:current]
+        prices = MasterPrice.where(product: product, primary: true)
+        unless prices.count.positive? && primary && MasterPrice.statuses[status] == MasterPrice.statuses[:current] && prices.first.id != id
+          return
+        end
 
         errors.add(:base, "There is already a primary price entry for item '#{product.code}'")
       end

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

@@ -32,6 +32,18 @@ module Comee
           self.status = Price.statuses[:future]
         end
       end
+
+      def past?
+        Price.statuses[status] == Price.statuses[:past]
+      end
+
+      def current?
+        Price.statuses[status] == Price.statuses[:current]
+      end
+
+      def future?
+        Price.statuses[status] == Price.statuses[:future]
+      end
     end
   end
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.33".freeze
+    VERSION = "0.1.35".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.35
 platform: ruby
 authors:
 - Henock L.