caboose-cms 0.8.63 → 0.8.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29bfd5e0f0743f4775004a3f59719900efc517f4
-  data.tar.gz: 459868d31674a46f4eff2f8bbf2f0ea962028789
+  metadata.gz: 2d35930182bb20d54aa4c0b5b5e8904f3ef90681
+  data.tar.gz: ec38ef84ece6b6ea25ffc3aff9efda36f0d738df
 SHA512:
-  metadata.gz: 9415b36ed339e43501767cbb4d991890eb1809ce1cf173d43d79e2d393d379c870191e1533cbf4eb6ea2b1e65902659c5959116bfcff80efc231c19892481a7d
-  data.tar.gz: 7306430f0dbcf7d6331d2ffa0c7b22669a3f6f62a726f71fc2fc8a3de6711e11db5d80851510ca0c83429ea620eccc507e4c676b9d4e33182400efc31212124a
+  metadata.gz: b8525496f4bdcebb66cb5da6402250ea8750c94afebbec73bd9f85d75a2980c3a4511f308931b83cce7cde4c840596764c80fe847a681459bae16c90629bd172
+  data.tar.gz: 5de7d8361b02fd800da40c2e24eb193cf4ba02a82d166394a6fe3c696f3faa0687783237d1b6c2886a11b91003e0b41328058858eec6946c564cfb985f74401a

data/app/controllers/caboose/invoice_transactions_controller.rb

@@ -6,7 +6,7 @@ module Caboose
       return if !user_is_allowed('invoices', 'edit')
     
       it = InvoiceTransaction.find(params[:id])
-      resp = params[:amount] ? it.capture(params[:amount]) : it.capture 
+      resp = params[:amount] ? it.capture(params[:amount].to_f) : it.capture 
       
       render :json => resp            
     end

data/app/controllers/caboose/products_controller.rb

@@ -175,6 +175,33 @@ module Caboose
       render :json => vendor.save
     end
     
+    # @route GET /admin/products/alternate-ids
+    def admin_alternate_ids
+      return if !user_is_allowed('products', 'view')
+      
+      query = ["select P.id as product_id, V.id as variant_id, P.title, P.option1, V.option1 as option1_value, P.option2, V.option2 as option2_value, P.option3, V.option3 as option3_value, V.alternate_id
+        from store_variants V
+        left join store_products P on V.product_id = P.id
+        where P.site_id = ?
+        order by title, P.option1, V.option1", @site.id]      
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
+      
+      @rows = rows.collect{ |row| Caboose::StdClass.new({
+        :product_id     => row[0],      
+        :variant_id     => row[1],
+        :title          => row[2],
+        :option1        => row[3],
+        :option1_value  => row[4],
+        :option2        => row[5],
+        :option2_value  => row[6],
+        :option3        => row[7],
+        :option3_value  => row[8],
+        :alternate_id   => row[9]        
+      })}
+
+      render :layout => 'caboose/admin'
+    end
+    
     # @route GET /admin/products
     def admin_index
       return if !user_is_allowed('products', 'view')

data/app/models/caboose/invoice_transaction.rb

@@ -69,8 +69,13 @@ module Caboose
           bt = nil
           begin            
             c = Stripe::Charge.retrieve(self.transaction_id)            
-            return { :error => "Amount given to capture is greater than the amount authorized." } if amount.to_f > (c.amount/100).to_f            
-            c = c.capture({ :amount => (amount*100).to_i })
+            return { :error => "Amount given to capture is greater than the amount authorized. amount = #{amount}, c.amount = #{c.amount}" } if (amount*100).to_i > c.amount            
+            amount = (amount.to_f * 100.0).to_i
+            if amount == c.amount              
+              c = c.capture
+            else
+              c = c.capture({ :amount => amount })
+            end
             bt = Stripe::BalanceTransaction.retrieve(c.balance_transaction)
           rescue Exception => ex
             resp.error = "Error during capture process\n#{ex.message}"                

data/app/views/caboose/products/admin_alternate_ids.html.erb

@@ -0,0 +1,58 @@
+
+<div id='crumbtrail'></div>
+<h1>Product Alternate IDs</h1>
+
+<p>Alternate IDs are used during import and export processes to associate products from other systems with the products in this system.</p>
+
+<table class='data'>
+  <tr>
+    <th>Product ID     </th>      
+    <th>Variant ID     </th>
+    <th>Alternate ID   </th>
+    <th>Title          </th>
+    <th>Option 1       </th><th>Value 1 </th>
+    <th>Option 2       </th><th>Value 2 </th>
+    <th>Option 3       </th><th>Value 3 </th>    
+  </tr>
+  <% @rows.each do |row| %>
+    <tr>
+      <td><%= row.product_id     %></td>      
+      <td><%= row.variant_id     %></td>
+      <td><div id='variant_<%= row.variant_id %>_alternate_id'></div></td>
+      <td><%= row.title          %></td>
+      <td><%= row.option1        %></td>
+      <td><%= row.option1_value  %></td>
+      <td><%= row.option2        %></td>
+      <td><%= row.option2_value  %></td>
+      <td><%= row.option3        %></td>
+      <td><%= row.option3_value  %></td>      
+    </tr>
+  <% end %>
+</table><br />
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<script type='text/javascript'>
+
+$(document).ready(function() {
+  var that = this;
+  
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');
+  add_to_crumbtrail('/admin/products/alternate-ids', 'Alternate IDs');
+  
+  <% @rows.each do |row| %>
+  new ModelBinder({
+    name: 'Variant',
+    id: <%= row.variant_id %>,
+    update_url: '/admin/products/<%= row.product_id %>/variants/<%= row.variant_id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'alternate_id', nice_name: 'Alternate ID', type: 'text', value: <%= raw Caboose.json(row.alternate_id) %>, width: 100, fixed_placeholder: false }      
+    ]
+  });
+  <% end %>
+});
+    
+</script>
+<% end %>

data/app/views/caboose/products/admin_index.html.erb

@@ -4,6 +4,7 @@
 <p style="margin: 12px 0">
   <a href="/admin/vendors/new">New Vendor</a><span style="margin: 0 3px">|</span>  
   <a href="/admin/products/sort">Sort Products</a><span style="margin: 0 3px">|</span>
+  <a href="/admin/products/alternate-ids">Alternate IDs</a><span style="margin: 0 3px">|</span>
   <a href='#'>Search Form</a>
 </p>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.63'
+  VERSION = '0.8.64'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.63
+  version: 0.8.64
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1150,6 +1150,7 @@ files:
 - app/views/caboose/products/_admin_header.html.erb
 - app/views/caboose/products/_sort_options.html.erb
 - app/views/caboose/products/admin_add_upcs.html.erb
+- app/views/caboose/products/admin_alternate_ids.html.erb
 - app/views/caboose/products/admin_delete_form.html.erb
 - app/views/caboose/products/admin_edit_categories.html.erb
 - app/views/caboose/products/admin_edit_category_images.html.erb