caboose-cms 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e70b82b6cfdc472f97cc722cadf5bdc5d6b64de4
-  data.tar.gz: 6e777b617dd35613e5a211adbe49c13cc3a75a5f
+  metadata.gz: c98b08e4c257fd3373839e4de959db0931d3785c
+  data.tar.gz: 822ea095f72aebd54c20c8c6552e28b0df7cca24
 SHA512:
-  metadata.gz: d35c00d7a8c43a37b5af8e5983230b11dcf684b7ae4d55f5dbdeb1451f40419e516bb37618ae7638a21563d16050f076bd1d6a8b24fc84230ed58ef7b38fc2ee
-  data.tar.gz: 57f5445a919934ba2da225f8f5b268617369926ca74c59c4cf526b9fd404703be0645f18a58bec38ea81b763db92b86f66fd87cba9aa614937340adc0dfb5add
+  metadata.gz: 82006d6ddc689439f838c6c471c3a6a994341c801af00b7fd8f61932a41e453af824e4562a3488a1e31b67f8f4930215dcd9eb16be9baf64742023802fc35c02
+  data.tar.gz: d239512ce0344384b4a09d602d0ce9bdeb488e9201394dc5084a4773bfb34f29db94cf998571e63ba18220dedd4e334925c2c53ad004a0d38eb84ef6f9b189a2

data/app/controllers/caboose/invoices_controller.rb

@@ -51,7 +51,7 @@ module Caboose
       resp.invoice_transactions = invoice.invoice_transactions.reorder(:date_processed).all
       
       render :json => resp
-    end
+    ends
     
     # @route GET /admin/invoices/new
     def admin_new
@@ -198,7 +198,9 @@ module Caboose
     def admin_print
       return if !user_is_allowed('invoices', 'edit')           
       
-      pdf = InvoicePdf.new
+      pdf = @site.store_config.custom_invoice_pdf
+      pdf = "InvoicePdf" if pdf.nil? || pdf.strip.length == 0                              
+      eval("pdf = #{pdf}.new")
       pdf.invoice = Invoice.find(params[:id])             
       send_data pdf.to_pdf, :filename => "invoice_#{pdf.invoice.id}.pdf", :type => "application/pdf", :disposition => "inline"   
     end

data/app/controllers/caboose/my_account_invoices_controller.rb

@@ -165,6 +165,21 @@ module Caboose
         :invoice_transactions
       ])
     end
+
+    # @route GET /my-account/invoices/:id/print
+    def invoice_pdf
+      invoice = Invoice.find(params[:id])
+
+      if invoice.customer_id != logged_in_user.id
+        @error = "The given invoice does not belong to you."
+        render :file => 'caboose/extras/error'
+        return
+      end
+
+      pdf = InvoicePdf.new
+      pdf.invoice = Invoice.find(params[:id])
+      send_data pdf.to_pdf, :filename => "invoice_#{pdf.invoice.id}.pdf", :type => "application/pdf", :disposition => "inline"
+    end
     
     # @route GET  /my-account/invoices/authnet-relay
     # @route POST /my-account/invoices/authnet-relay

data/app/controllers/caboose/vendors_controller.rb

@@ -1,14 +1,14 @@
 module Caboose
   class VendorsController < Caboose::ApplicationController
         
-    # @route GET /admin/vendors/:id
+    # @route GET /admin/store/vendors/:id
     def admin_edit
       return if !user_is_allowed('vendors', 'edit')
       @vendor = Vendor.find(params[:id])
       render :layout => 'caboose/admin'
     end
 
-    # @route GET /admin/vendors
+    # @route GET /admin/store/vendors
     def admin_index
       return if !user_is_allowed('vendors', 'view')
       
@@ -30,13 +30,13 @@ module Caboose
     end
     
     # @route_priority 3
-    # @route GET /admin/vendors/new
+    # @route GET /admin/store/vendors/new
     def admin_new
       return if !user_is_allowed('vendors', 'add')
       render :layout => 'caboose/admin'
     end
 
-    # @route POST /admin/vendors/:id/image
+    # @route POST /admin/store/vendors/:id/image
     def admin_update_image
       return if !user_is_allowed('vendors', 'edit')
       
@@ -50,7 +50,7 @@ module Caboose
       render :json => resp            
     end
 
-    # @route PUT /admin/vendors/:id/update
+    # @route PUT /admin/store/vendors/:id/update
     def admin_update
       return if !user_is_allowed('vendors', 'edit')
       vendor = Vendor.find(params[:id])
@@ -67,7 +67,7 @@ module Caboose
       render :json => { :success => vendor.save }
     end
 
-    # @route POST /admin/vendors
+    # @route POST /admin/store/vendors
     def admin_add
       return if !user_is_allowed('vendors', 'add')
       
@@ -81,7 +81,7 @@ module Caboose
       render :json => { :success => vendor.save, :redirect => "/admin/vendors/#{vendor.id}" }
     end
     
-    # @route DELETE /admin/vendors/:id
+    # @route DELETE /admin/store/vendors/:id
     def admin_delete      
       return if !user_is_allowed('vendors', 'delete')
       v = Vendor.find(params[:id])
@@ -94,13 +94,13 @@ module Caboose
     end
     
     # @route_priority 1
-    # @route GET /admin/vendors/options
+    # @route GET /admin/store/vendors/options
     def options      
       render :json => Vendor.where(:site_id => @site.id).reorder(:name).all.collect{ |v| { :value => v.id, :text => v.name }}      
     end
     
     # @route_priority 2
-    # @route GET /admin/vendors/status-options
+    # @route GET /admin/store/vendors/status-options
     def status_options      
       render :json => [
         { :text => 'Active'   , :value => 'Active'   },

data/app/models/caboose/core_plugin.rb

@@ -39,7 +39,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
       item['children'] << { 'id' => 'invoices'         , 'href' => '/admin/invoices'          , 'text' => 'Invoices'          , 'modal' => false } if user.is_allowed('invoices'         , 'view')
       item['children'] << { 'id' => 'products'         , 'href' => '/admin/products'          , 'text' => 'Products'          , 'modal' => false } if user.is_allowed('products'         , 'view')
       item['children'] << { 'id' => 'shippingpackages' , 'href' => '/admin/shipping-packages' , 'text' => 'Shipping Packages' , 'modal' => false } if user.is_allowed('shippingpackages' , 'view')
-      item['children'] << { 'id' => 'vendors'          , 'href' => '/admin/vendors'           , 'text' => 'Vendors'           , 'modal' => false } if user.is_allowed('vendors'          , 'view')    
+      item['children'] << { 'id' => 'vendors'          , 'href' => '/admin/store/vendors'     , 'text' => 'Vendors'           , 'modal' => false } if user.is_allowed('vendors'          , 'view')    
       nav << item if item['children'].count > 0
     end
                 

data/app/models/caboose/invoice_pdf.rb

@@ -14,9 +14,8 @@ module Caboose
       font_size 9
 
       img = open("http://cabooseit.s3.amazonaws.com/uploads/template.jpg")
-   #   image img, :width => 610, :at => [-30, 755]
-
-      #image open("https://dmwwflw4i3miv.cloudfront.net/logo.png"), :position => :center
+   
+      header_info
       move_down 10
       invoice_info
       move_down 15
@@ -28,6 +27,9 @@ module Caboose
       render
     end
     
+    def header_info
+    end
+    
     def formatted_phone(str)
       return '' if str.nil?
       str = str.gsub(/[^0-9]/i, '')
@@ -52,6 +54,8 @@ module Caboose
       sc = self.invoice.site.store_config
       ot = self.invoice.invoice_transactions.where(:transaction_type => InvoiceTransaction::TYPE_AUTHORIZE, :success => true).first
       
+      return unless ot
+
       case ot.payment_processor
         when StoreConfig::PAYMENT_PROCESSOR_AUTHNET
           
@@ -82,6 +86,18 @@ module Caboose
       invoice_info = "Invoice Number: #{invoice.invoice_number}\n"
       invoice_info << "Invoice Date: #{invoice.date_created.strftime('%d %b %Y %H:%M:%S %p')}\n"
       invoice_info << "Status: #{invoice.status.capitalize}\n"
+      
+      if invoice.status == Invoice::STATUS_PENDING
+        s  = self.invoice.site
+        sc = self.invoice.site.store_config
+        invoice_info << "\n"
+        invoice_info << "Please mail payments to:\n"
+        invoice_info << "#{s.description}\n"
+        invoice_info << "#{sc.origin_address1}\n"
+        invoice_info << "#{sc.origin_address2}\n"
+        invoice_info << "#{sc.origin_city}, " << "#{sc.origin_state} " << "#{sc.origin_zip}\n"
+      end
+
       tbl = []
       tbl << [
         { :content => invoice_info }
@@ -92,6 +108,7 @@ module Caboose
 
     
     def customer_info
+      return if self.invoice.status == Invoice::STATUS_PENDING
 
       c = invoice.customer
 
@@ -254,6 +271,7 @@ module Caboose
     end
 
     def payment_info
+      return if self.invoice.status == Invoice::STATUS_PENDING
 
       trans = invoice.invoice_transactions.where(:transaction_type => InvoiceTransaction::TYPE_AUTHORIZE, :success => true).first
       tbl = []

data/app/models/caboose/schema.rb

@@ -841,7 +841,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :default_vendor_id                 , :integer ],
         [ :default_product_status            , :string  ],
         [ :default_taxable                   , :boolean ],
-        [ :allow_instore_pickup              , :boolean  , { :default => false }]        
+        [ :allow_instore_pickup              , :boolean  , { :default => false }],
+        [ :custom_invoice_pdf                , :string  ]
       ],  
       Caboose::Subscription => [      
         [ :variant_id  , :integer ],

data/app/models/caboose/store_config.rb

@@ -47,7 +47,8 @@ module Caboose
       :length_unit,
       :download_instructions,
       :weight_unit,
-      :allow_instore_pickup
+      :allow_instore_pickup,
+      :custom_invoice_pdf
       
     WEIGHT_UNIT_METRIC   = 'g'
     WEIGHT_UNIT_IMPERIAL = 'oz'

data/app/views/caboose/my_account_invoices/edit.html.erb

@@ -12,7 +12,10 @@ store_config = @invoice.site.store_config
 <div id='invoice_table'></div>
 <div id='message'></div>
 
-<p><input type='button' value='< Back' class='btn' onclick="window.location='/my-account/invoices';" /></p>
+<p>
+	<input type='button' value='< Back' class='btn' onclick="window.location='/my-account/invoices';" />
+	<input type='button' value='Print Invoice' class='btn' onclick='window.location="/my-account/invoices/<%= @invoice.id %>/print";' />
+</p>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag 'https://js.stripe.com/v2/' %>

data/app/views/caboose/vendors/admin_edit.html.erb

@@ -4,7 +4,7 @@
 <p><div id="vendor_<%= @vendor.id %>_featured"></div></p>
 <p><div id="vendor_<%= @vendor.id %>_image"></div></p>
 <div id='message'></div>
-<input type="button" value="< Back" onclick="window.location='/admin/vendors';" />
+<input type="button" value="< Back" onclick="window.location='/admin/store/vendors';" />
 <input type="button" value="Delete" onclick="delete_vendor(<%= @vendor.id %>);" />
 
 <% content_for :caboose_js do %>
@@ -14,13 +14,13 @@ $(document).ready(function() {
   m = new ModelBinder({
     id: <%= @vendor.id %>,
     name: 'Vendor',
-    update_url: '/admin/vendors/<%= @vendor.id %>',
+    update_url: '/admin/store/vendors/<%= @vendor.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { name: 'name'     , nice_name: 'Name'     , type: 'text'     , value: <%= raw Caboose.json(@vendor.name)              %>, width: 500 },
-      { name: 'status'   , nice_name: 'Status'   , type: 'select'   , value: <%= raw Caboose.json(@vendor.status)            %>, width: 500, options_url: '/admin/vendors/status-options' },
+      { name: 'status'   , nice_name: 'Status'   , type: 'select'   , value: <%= raw Caboose.json(@vendor.status)            %>, width: 500, options_url: '/admin/store/vendors/status-options' },
       { name: 'featured' , nice_name: 'Featured' , type: 'checkbox' , value: <%= @vendor.featured ? 1 : 0                    %>, width: 500 },
-      { name: 'image'    , nice_name: 'Image'    , type: 'image'    , value: <%= raw Caboose.json(@vendor.image.url(:thumb)) %>, width: 500 , update_url: '/admin/vendors/<%= @vendor.id %>/image' }
+      { name: 'image'    , nice_name: 'Image'    , type: 'image'    , value: <%= raw Caboose.json(@vendor.image.url(:thumb)) %>, width: 500 , update_url: '/admin/store/vendors/<%= @vendor.id %>/image' }
     ]
   })
 });
@@ -38,7 +38,7 @@ function delete_vendor(vendor_id, confirm)
   }
   $('#message').html("<p class='loading'>Deleting vendor...</p>");
   $.ajax({
-    url: '/admin/vendors/' + vendor_id,
+    url: '/admin/store/vendors/' + vendor_id,
     type: 'delete',
     success: function(resp) {
       if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");

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

@@ -1,8 +1,8 @@
 <h1>Vendors</h1>
 
-<p><a href="/admin/vendors/new">New Vendor</a></p>
+<p><a href="/admin/store/vendors/new">New Vendor</a></p>
 
-<form action="/admin/vendors" method="get" style="margin: 0 0 12px">
+<form action="/admin/store/vendors" method="get" style="margin: 0 0 12px">
   <input name="name_like" value="<%= params[:name_like] %>" placeholder="Search for vendor" />
   <input type="submit" value="Search" />
 </form>
@@ -20,7 +20,7 @@
     </tr>
     
     <% @vendors.each do |vendor| %>
-      <tr onclick="window.location='/admin/vendors/<%= vendor.id %>';">
+      <tr onclick="window.location='/admin/store/vendors/<%= vendor.id %>';">
         <td style="text-align: center"><%= raw vendor.id %></td>
         <td><% if vendor.image %><img src='<%= raw vendor.image.url(:tiny) %>' /><% else %>&nbsp;<% end %></td>
         <td><%= raw vendor.name %></td>

data/app/views/caboose/vendors/admin_new.html.erb

@@ -1,12 +1,12 @@
 <h1>New Vendor</h1>
 
-<form id="new-vendor" action="/admin/vendors" method="post">
+<form id="new-vendor" action="/admin/store/vendors" method="post">
   <input type="hidden" name="authenticity_token" value="<%= form_authenticity_token %>" />
   <p><input id="name" name="name" id='name' type="text" placeholder="Vendor Name" style="width: 400px" /></p>
   <p><input type='checkbox' name='stay' id='stay' value='1' /> Stay here so I can add another vendor</p>
   <div id='message'></div>
   <p>
-    <input type="button" value="< Back" onclick="window.location='/admin/vendors';" />
+    <input type="button" value="< Back" onclick="window.location='/admin/store/vendors';" />
     <input type="submit" value="Add Vendor" />    
   </p>
 </form>
@@ -20,7 +20,7 @@ $(document).ready(function() {
     
     $('#message').html("<p class='loading'>Adding vendor...</p>");        
     $.ajax({
-      url: '/admin/vendors',
+      url: '/admin/store/vendors',
       type: 'post',
       data: $('#new-vendor').serialize(),
       success: function(resp) {

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.6'
+  VERSION = '0.9.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - William Barry