c80_shared 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8c57731d19725bf3952ac228856e67b329f76a2a3a0c910c9f5d1b69b9fa3cc
-  data.tar.gz: 27d7d078fa9abea8900008bab8eadd20fcb135237047d011e5a5fb4ed5a6cc4a
+  metadata.gz: 2b5c44048049aaf4d63e6c25d454f8d047f108f1d81ea0fcc04d572dbe99a6f9
+  data.tar.gz: 8982a07e65a36b2976a02a0b8fdf4e8bbdebe0f17db01a78359dc205d235e85c
 SHA512:
-  metadata.gz: d952202ea067e617d791f40a3f67ea612b40e695fc5b3ff3e5d1429ae8f8937e2599a6b2acfb97ce6373021ec1eef1a33085ce57ee1edd852ec8a21c7066adc8
-  data.tar.gz: ffcbbac4f4cc3d358b1b9854908461af8d7aece4f63fd9ec5d14bb215944261377128c63143f12c1e8fab46ad6535514184b8055fb20a96d318541205caf409d
+  metadata.gz: e27dadb2b04c252fbd11729327bb4ea3135e4ee874e8a4e4e100c11479f01caccc46f9cc75122b4e8720f8b7ea3a2b0bf7ac4886aa45438d5dc6495b2c1a2210
+  data.tar.gz: 44f76b84245b8b9b8ffa0d6ca8e7765043f21b9b929870ed1e11c629adbed92df15d7c11c813e51911d9acdf3fd67c311fb7ef03dd77f2dff5aa815507991aa4

data/app/serializers/lease/rebate_serializer.rb

@@ -12,6 +12,7 @@ module Lease
           :amount,
           :currency,
           :human_price,
+          :human_price_vat_incl,
           :old_amount,
           :old_currency,
           :old_human_price
@@ -30,6 +31,7 @@ module Lease
         { currency: rebate.currency }
       end
 
+      # то, что юзер ввёл в диалоговое окно - "total renting price, VAT excl."
       def human_price(rebate)
         val = nil
         if rebate.amount.present? && rebate.currency.present?
@@ -38,6 +40,17 @@ module Lease
         { human_price: val }
       end
 
+      def human_price_vat_incl(rebate)
+        val = nil
+        if rebate.amount.present? && rebate.currency.present?
+          val = rebate.amount / 100.0 * (100 + rebate.bid[:vat])
+          val = num_to_cur(val, rebate.currency, @opts[:locale])
+        end
+
+        { human_price_vat_include: val.to_i }
+      end
+
+      # VAT incl
       def old_amount(rebate)
         { old_amount: rebate.old_amount }
       end
@@ -46,6 +59,7 @@ module Lease
         { old_currency: rebate.old_currency }
       end
 
+      # VAT incl
       def old_human_price(rebate)
         val = nil
         if rebate.old_amount.present? && rebate.old_currency.present?

data/lib/c80_shared/version.rb

@@ -1,3 +1,3 @@
 module C80Shared
-  VERSION = "0.1.17"
+  VERSION = "0.1.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_shared
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-07 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler