From 404c16657e29cb3ced08b8572b8656de169273d2 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 5 Feb 2019 15:55:46 +0100 Subject: [PATCH] mail DE: There are no letters in Germany > 1kg anymore --- .../sysmocom_mail_value_calculator.rb | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app/models/spree/calculator/sysmocom_mail_value_calculator.rb b/app/models/spree/calculator/sysmocom_mail_value_calculator.rb index 91506c3..3fe3e34 100644 --- a/app/models/spree/calculator/sysmocom_mail_value_calculator.rb +++ b/app/models/spree/calculator/sysmocom_mail_value_calculator.rb @@ -32,8 +32,6 @@ module Spree # Maxibrief Einschreiben: 5.10 if weight < 1000 return 5.10 - elsif weight < 2000 - return 7.30 else return 99999 end @@ -53,13 +51,22 @@ module Spree end def self.available?(object) - # Letters have a maximum weight of 2kg + iso_code = extract_iso_code(object) weight = total_weight(object) - if weight < 2000 - true - else - false - end + if iso_code == 'DE' + if weight < 1000 + return true + else + return false + end + else + # Letters have a maximum weight of 2kg + if weight < 2000 + return true + else + return false + end + end end def compute(object)