piggybak 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3e04625ac77678c260c682d46caea2666a1f09
-  data.tar.gz: 34960254b38cfdfb25277687ac0abb02ea8774d9
+  metadata.gz: 9d04c0c0da3e2fb5df67c8e0802d37839fc0b1df
+  data.tar.gz: a760a4ce5e57084ec8a6fc3c931d7a0ca9cb774f
 SHA512:
-  metadata.gz: 6f0129952e567782cd4dc5377ade33f65e36785671d94200c506402719437f0d73ef03f891806ca3a87b08ceeca48081341d1cc4b763a9b7176a9e030ded99d2
-  data.tar.gz: 2bbac1f4f6d2fe5426d3844a0ef6a4608c7938634fac6e303771b32c1fa53bf749aeffa6ec32fc9082e5e8af50995fd110ea23b33cb99199c6a6b57a3f645daa
+  metadata.gz: 065d52339792d93e27b7af4df8f3d8f3c3aab3b3e7d08b7dc0a1dae00b7483fc2dc874b6ecc7818ea7227e9ffc874862452cc6b2456144af07cfb1837caf4098
+  data.tar.gz: 78605631ca76c7310d301721fb841fbbcfbe48fb7846b3d19ec36ce0a3b5ff7159460de4aaaa7c00f8292216e691d9252680f8fe9ec5d0ebba6d0c9763d2fcb1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.7.5)
+    piggybak (0.7.6)
       activemerchant
       countries
       rack-ssl-enforcer
@@ -9,41 +9,33 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    active_utils (2.0.2)
-      activesupport (>= 2.3.11)
-      i18n
-    activemerchant (1.42.7)
-      active_utils (~> 2.0, >= 2.0.1)
-      activesupport (>= 2.3.14, < 5.0.0)
+    activemerchant (1.47.0)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
-      i18n (~> 0.5)
-      json (~> 1.7)
-      money (< 7.0.0)
+      i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activesupport (4.0.4)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.16)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     builder (3.2.2)
-    countries (0.9.3)
+    countries (0.11.3)
       currencies (~> 0.4.2)
+      i18n_data (~> 0.6.0)
     currencies (0.4.2)
-    i18n (0.6.9)
-    json (1.8.1)
-    mini_portile (0.5.3)
-    minitest (4.7.5)
-    money (6.1.1)
-      i18n (~> 0.6.4)
-    multi_json (1.9.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    rack-ssl-enforcer (0.2.6)
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
-    tzinfo (0.3.39)
+    i18n (0.7.0)
+    i18n_data (0.6.3)
+    json (1.8.2)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack-ssl-enforcer (0.2.8)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/app/controllers/piggybak/orders_controller.rb

@@ -70,7 +70,7 @@ module Piggybak
       response.headers['Cache-Control'] = 'no-cache'
 
       if !session.has_key?(:last_order)
-        redirect_to root_url 
+        redirect_to main_app.root_url 
         return
       end
 
@@ -78,7 +78,7 @@ module Piggybak
     end
 
     def list
-      redirect_to root_url if current_user.nil?
+      redirect_to main_app.root_url if current_user.nil?
     end
 
     def download

data/app/models/piggybak/order.rb

@@ -81,6 +81,17 @@ module Piggybak
         end
       end
 
+      # Postprocess everything but payments first
+      self.line_items.each do |line_item|
+        next if line_item.line_item_type == "payment"
+        method = "postprocess_#{line_item.line_item_type}"
+        if line_item.respond_to?(method)
+          if !line_item.send(method)
+            return false
+          end
+        end
+      end
+      
       # Recalculate and create line item for tax
       # If a tax line item already exists, reset price
       # If a tax line item doesn't, create
@@ -96,17 +107,6 @@ module Piggybak
       elsif tax_line_item.any?
         tax_line_item.first.mark_for_destruction
       end
-
-      # Postprocess everything but payments first
-      self.line_items.each do |line_item|
-        next if line_item.line_item_type == "payment"
-        method = "postprocess_#{line_item.line_item_type}"
-        if line_item.respond_to?(method)
-          if !line_item.send(method)
-            return false
-          end
-        end
-      end
      
       # Recalculating total and total due, in case post process changed totals
       self.total_due = 0

data/lib/piggybak/cli.rb

@@ -53,13 +53,21 @@ module Piggybak
   
     desc "add_javascript_include_tag", "add javascript include tag to application layout"
     def add_javascript_include_tag
-      jit_code_block = <<-eos
-          \n  <% if "\#{params[:controller]}#\#\{params[:action]\}" == "piggybak/orders#submit" -%>
-      <%= javascript_include_tag "piggybak/piggybak-application" %>\n  <% end -%>
-      eos
-    
-      insert_into_file 'app/views/layouts/application.html.erb', jit_code_block, :after => "<%= javascript_include_tag \"application\" %>"
-    
+      if File.exist?('app/views/layouts/application.html.haml')
+        jit_code_block = <<-eos
+            \n    - if "\#{params[:controller]}#\#\{params[:action]\}" == "piggybak/orders#submit"
+        = javascript_include_tag "piggybak/piggybak-application"
+        eos
+
+        insert_into_file 'app/views/layouts/application.html.haml', jit_code_block, :after => '= javascript_include_tag "application"'
+      else
+        jit_code_block = <<-eos
+            \n  <% if "\#{params[:controller]}#\#\{params[:action]\}" == "piggybak/orders#submit" -%>
+        <%= javascript_include_tag "piggybak/piggybak-application" %>\n  <% end -%>
+        eos
+      
+        insert_into_file 'app/views/layouts/application.html.erb', jit_code_block, :after => "<%= javascript_include_tag \"application\" %>"
+      end
     end
     
     desc "create user class", "Create a user class"

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Steph Skardal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries