bbmb 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 539253d09b62765c28bc81f550e1831fd5d6fade
-  data.tar.gz: 54e3f3a803f0b54ec32c1fd2bc111f2f07ed5e63
+  metadata.gz: b9960291f2555edc515e193b763d95d082fadb45
+  data.tar.gz: f4d91f9aa827270b523daae89046879d03d52c4f
 SHA512:
-  metadata.gz: 5b56bf4ea3c9fc2f19eca1eeea3db51ca2faee383fe63f79fc0940c0e7531c8b090d7b7368be64d14b177fd3363c9868d9e3a6e4383b5700117de2374d5b6f6a
-  data.tar.gz: 2bc9a62ea60ec95ee4141921c4aeb75fae09fd12a275e453404471eac7b0a6d4a205ad2b2d49e42677cf3b4bbc892dd4c214614a8429bdf32ce2ee9911367147
+  metadata.gz: 48b42e38b311a50603742e0afd4b7149dbb66fcd98307baaa888619ca6312f40ac196ece8aaf57808070255df9b00098383677285c12dd2bb091cdba6d495709
+  data.tar.gz: 7c60ac0e1f92d79270b16341da870032a1c88096209d75bc38693023b53f0edffb81fc9a82d98fe680afabea61fddd8544ed83a215a18354de28931dac1d7253

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.2.4 / 22.05.2017
+
+* Fix send_order
+
 === 2.2.3 / 22.05.2017
 
 * Delete in Schnellbestellung all positions with an invalid product

data/lib/bbmb/html/state/current_order.rb

@@ -44,8 +44,9 @@ class CurrentOrder < Global
     unless error?
       _customer.commit_order!
       order = @model
+      SBSM.info("committing #{_customer.customer_id} #{order.order_id} #{caller[0..10].join("\n")}")
       @session.async {
-        @session.send_order order, _customer
+        @session.app.send_order order, _customer
       }
       @model = _customer.current_order
       Info.new(@session, :message => :order_sent,

data/lib/bbmb/util/app.rb

@@ -62,6 +62,33 @@ module BBMB
               start_service
           }
       end
+      def send_order order, customer
+        SBSM.logger.info "send_order #{order.order_id} and customer #{customer.customer_id}"
+        begin
+          Timeout.timeout(300) {
+            BBMB::Util::TargetDir.send_order(order)
+          }
+        rescue StandardError => err
+          err.message << " (Email: #{customer.email} - Customer-Id: #{customer.customer_id})"
+          BBMB::Util::Mail.notify_error(err)
+        end
+        begin
+          Timeout.timeout(300) {
+            BBMB::Util::Mail.send_order(order)
+          }
+        rescue StandardError => err
+          err.message << " (Email: #{customer.email} - Customer-Id: #{customer.customer_id})"
+          BBMB::Util::Mail.notify_error(err)
+        end
+        begin
+          Timeout.timeout(300) {
+            BBMB::Util::Mail.send_confirmation(order)
+          }
+        rescue StandardError => err
+          err.message << " (Email: #{customer.email} - Customer-Id: #{customer.customer_id})"
+          BBMB::Util::Mail.notify_error(err)
+        end
+      end
     end
   end
 end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger