stockor 0.3.0 → 0.4.0

data/templates/print/types/invoice/default.tex.erb

@@ -4,7 +4,9 @@
   form_title: "Invoice # #{@invoice.visible_id}"
 } ) %>
 <%= partial 'bill_to_ship_to', record: @invoice -%>
+\medskip
 <%=partial 'skus_table_invoice_info_line', invoice: @invoice -%>
+%
 <%= partial 'skus_table',
     record: @invoice,
     lines: @invoice.lines.regular,

data/templates/print/types/invoice/labor.tex.erb

@@ -27,7 +27,8 @@ groups.push(
     line_template: 'skus_table_labor_line',
     headings_template: 'skus_table_labor_col_hdr',
     groups: groups.many? ? groups : false,
-    record: @invoice, lines: @invoice.lines
+    record: @invoice, lines: @invoice.lines,
+    footer: 'skus_table_invoice_footer'
 -%>
 %
 \end{document}

data/templates/print/types/invoice/ticket.tex.erb

@@ -0,0 +1,41 @@
+<% line = @invoice.lines.first
+   qty  = line.qty.to_i %>
+\usepackage{xcolor}
+\geometry{a6paper, margin=3mm, right=6mm, headheight=0mm, landscape}
+\usepackage[]{qrcode}
+
+
+\begin{document}
+\noindent
+\pagecolor{yellow!25}
+\fancypage{\Ovalbox}{}
+
+\begin{tabu} to \textwidth{X[-1,m,l]X[0,m,c]r}
+<% if (logo = @invoice.location.get_logo).present? -%>
+\includegraphics[align=t,height=14mm,keepaspectratio]{<%= logo.file.path %>}
+<% end -%> &
+  {\bf \LARGE <%=q @invoice.location.address.name %>}
+
+  \small <%= break_lines @invoice.location.address.to_s(include: [:phone], without:[:name]) %> &
+  \qrcode[]{<%= @invoice.hash_code %>} \\
+ \end{tabu}
+
+\bigskip
+
+
+{\bf \large This ticket admits <%= Skr::Number.as_words(qty) %> (<%= qty %>) <%= pluralize(qty, 'person') %> to:}
+\begin{center}
+<% if (snippet = get_snippet(@invoice.options['print_content'])) %>
+<%= snippet %>
+<% else %>
+
+\bigskip
+\bigskip
+
+{\bf\LARGE <%= line.description %>}
+\vfill
+<%= @invoice.options['event_info'] %>
+<% end %>
+
+\end{center}
+\end{document}

data/templates/print/types/payment/default.tex.erb

@@ -6,16 +6,17 @@
 \begin{document}
 \noindent
 
-\begin{textblock}{195}(10,15)
-  \begin{tabu} to \columnwidth{lXX[-1m]r}
-  % <% if logo = @payment.location.get_logo %>
-    \includegraphics[align=t,height=14mm,keepaspectratio]{<%=
-    logo.file.path %>}
-  % <% end %>
-        & \small <%= break_lines @payment.location.address.to_s %>
-        & \tiny <%= break_lines @payment.bank_account.address %>
-        & \raisebox{-3mm}{\shadowbox{\large\bf {CHECK \# <%= @payment.check_number %> } }}\\
-     \end{tabu}
+\begin{textblock}{195}(10,10)
+<% if (logo = @payment.location.get_logo).present? -%>
+  \begin{tabularx}{\columnwidth}{lXXr}
+    \includegraphics[align=t,height=14mm,keepaspectratio]{<%= logo.file.path %>} &
+<% else -%>
+  \begin{tabularx}{\columnwidth}{XXr}
+<% end -%>
+  \small <%= break_lines @payment.location.address.to_s(include: [:phone]) %> &
+  \scriptsize <%= break_lines @payment.bank_account.address.to_s(include: [:phone]) %> &
+  \raisebox{-3mm}{\shadowbox{\large\bf {CHECK \# <%= @payment.check_number %> } }}\\
+ \end{tabularx}
 \end{textblock}
 %
 \begin{textblock}{185}(10,30)
@@ -53,11 +54,11 @@
   \end{tabu}
 \end{textblock}
 %
-\begin{textblock}{10}(45,79.7)
+\begin{textblock}{10}(45,80.5)
 \micr <%= sprintf('%s%07i%s', 'C', @payment.check_number, 'C') %>
 \end{textblock}
 %
-\begin{textblock}{20}(72,79.7)
+\begin{textblock}{80}(71,80.5)
 \micr A<%= @payment.bank_account.routing_number %>A C<%=@payment.bank_account.account_number %>C
 \end{textblock}
 %

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.10.1
 - !ruby/object:Gem::Dependency
   name: erb_latex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lanes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: numbers_in_words
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,30 @@ dependencies:
   name: ruby-freshbooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: activemerchant
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.59'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.59'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +216,7 @@ extra_rdoc_files: []
 files:
 - ".dir-locals.el"
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -211,8 +226,23 @@ files:
 - app.json
 - client/images/skr/logo-sm.png
 - client/skr/Extension.coffee
+- client/skr/api.js
+- client/skr/api.scss
+- client/skr/api/Components/AddressForm.cjsx
+- client/skr/api/Components/Base.coffee
+- client/skr/api/Components/SaleHistory.cjsx
+- client/skr/api/Components/SingleItemCart.cjsx
+- client/skr/api/Models/Base.coffee
+- client/skr/api/Models/Cart.coffee
+- client/skr/api/Models/Sale.coffee
+- client/skr/api/Models/SalesHistory.coffee
+- client/skr/api/Models/Sku.coffee
+- client/skr/api/SingleItemCheckout.cjsx
+- client/skr/api/namespace.js
+- client/skr/api/onReady.coffee
 - client/skr/components/.gitkeep
 - client/skr/components/BankAccountFinder.cjsx
+- client/skr/components/CreditCardForm.cjsx
 - client/skr/components/Currency.cjsx
 - client/skr/components/CustomerFinder.cjsx
 - client/skr/components/CustomerLink.cjsx
@@ -220,8 +250,10 @@ files:
 - client/skr/components/GlAccountChooser.cjsx
 - client/skr/components/InvoiceFinder.cjsx
 - client/skr/components/InvoiceLink.cjsx
+- client/skr/components/LatexSnippets.cjsx
 - client/skr/components/LocationChooser.cjsx
 - client/skr/components/PaymentCategoryFinder.cjsx
+- client/skr/components/PrintButton.cjsx
 - client/skr/components/PrintFormChooser.cjsx
 - client/skr/components/SalesOrderFinder.cjsx
 - client/skr/components/ScreenControls.cjsx
@@ -236,12 +268,15 @@ files:
 - client/skr/components/UserPreferences.cjsx
 - client/skr/components/VendorFinder.cjsx
 - client/skr/components/address/Address.cjsx
+- client/skr/components/address/index.js
 - client/skr/components/address/styles.scss
 - client/skr/components/styles.scss
 - client/skr/index.js
 - client/skr/models/Address.coffee
 - client/skr/models/BankAccount.coffee
 - client/skr/models/Base.coffee
+- client/skr/models/CreditCard.coffee
+- client/skr/models/CreditCardGateway.coffee
 - client/skr/models/Customer.coffee
 - client/skr/models/CustomerProject.coffee
 - client/skr/models/GlAccount.coffee
@@ -266,6 +301,7 @@ files:
 - client/skr/models/PtLine.coffee
 - client/skr/models/PurchaseOrder.coffee
 - client/skr/models/SalesOrder.coffee
+- client/skr/models/SequentialId.coffee
 - client/skr/models/Sku.coffee
 - client/skr/models/SkuLoc.coffee
 - client/skr/models/SkuTran.coffee
@@ -311,6 +347,7 @@ files:
 - client/skr/screens/invoice/Invoice.cjsx
 - client/skr/screens/invoice/Payment.cjsx
 - client/skr/screens/invoice/index.js
+- client/skr/screens/invoice/index.scss
 - client/skr/screens/locations/Locations.cjsx
 - client/skr/screens/locations/index.js
 - client/skr/screens/mixins/index.js
@@ -322,6 +359,9 @@ files:
 - client/skr/screens/payment-terms/index.scss
 - client/skr/screens/payments/Payments.cjsx
 - client/skr/screens/payments/index.js
+- client/skr/screens/sale-report/SaleReport.cjsx
+- client/skr/screens/sale-report/index.js
+- client/skr/screens/sale-report/index.scss
 - client/skr/screens/sales-order/SalesOrder.cjsx
 - client/skr/screens/sales-order/index.js
 - client/skr/screens/sku-maint/SkuMaint.cjsx
@@ -343,6 +383,7 @@ files:
 - client/skr/screens/vendor-maint/VendorMaint.cjsx
 - client/skr/screens/vendor-maint/index.js
 - client/skr/styles.scss
+- client/skr/vendor/index.js
 - client/skr/views/.gitkeep
 - client/skr/views/Base.coffee
 - coffeelint.json
@@ -396,6 +437,12 @@ files:
 - db/migrate/20160229002044_create_bank_accounts.rb
 - db/migrate/20160229041711_create_payments.rb
 - db/migrate/20160307022705_create_create_combined_uom_views.rb
+- db/migrate/20160517032350_create_remove_location_logos.rb
+- db/migrate/20160531014306_create_public_skus.rb
+- db/migrate/20160604195848_create_null_addresses.rb
+- db/migrate/20160605024432_create_sku_associations_views.rb
+- db/migrate/20160608023553_create_invoice_payments.rb
+- db/migrate/20160620010455_add_payments_to_inv_details.rb
 - db/schema.sql
 - db/seed.rb
 - db/seed/chart_of_accounts.yml
@@ -422,11 +469,16 @@ files:
 - lib/skr/configuration.rb
 - lib/skr/db/migration_helpers.rb
 - lib/skr/extension.rb
+- lib/skr/handlers/credit_card_gateway.rb
 - lib/skr/handlers/fresh_books_import.rb
 - lib/skr/handlers/invoice_from_time_entries.rb
+- lib/skr/handlers/sales.rb
+- lib/skr/handlers/sequential_ids.rb
+- lib/skr/handlers/skus.rb
 - lib/skr/jobs/fresh_books/base.rb
 - lib/skr/jobs/fresh_books/import.rb
 - lib/skr/jobs/fresh_books/retrieve.rb
+- lib/skr/merchant_gateway.rb
 - lib/skr/model.rb
 - lib/skr/models/address.rb
 - lib/skr/models/bank_account.rb
@@ -468,12 +520,16 @@ files:
 - lib/skr/models/voucher.rb
 - lib/skr/number.rb
 - lib/skr/print.rb
+- lib/skr/print/context.rb
 - lib/skr/print/form.rb
 - lib/skr/print/template.rb
 - lib/skr/standard_pricing_provider.rb
 - lib/skr/string.rb
 - lib/skr/version.rb
 - lib/stockor.rb
+- npm-build/package.json
+- npm-build/vendor.js
+- npm-build/webpack.config.js
 - spec/fixtures/skr/address.yml
 - spec/fixtures/skr/bank_account.yml
 - spec/fixtures/skr/customer.yml
@@ -513,6 +569,7 @@ files:
 - spec/server/bank_account_spec.rb
 - spec/server/customer_project_spec.rb
 - spec/server/handlers/invoice_from_time_entries_spec.rb
+- spec/server/handlers/sequential_ids_spec.rb
 - spec/server/jobs/fresh_books/import_spec.rb
 - spec/server/jobs/fresh_books/retrieve_spec.rb
 - spec/server/models/address_spec.rb
@@ -552,6 +609,7 @@ files:
 - spec/server/print/template_spec.rb
 - spec/server/spec_helper.rb
 - spec/server/time_entry_spec.rb
+- spec/skr/api/SingleItemCheckoutSpec.cjsx
 - spec/skr/components/SkuLinesSpec.coffee
 - spec/skr/concerns/code_identifier_spec.rb
 - spec/skr/models/AddressSpec.coffee
@@ -599,6 +657,7 @@ files:
 - spec/skr/screens/payment-category/PaymentCategorySpec.coffee
 - spec/skr/screens/payment-terms/PaymentTermsSpec.coffee
 - spec/skr/screens/payments/PaymentsSpec.coffee
+- spec/skr/screens/sale-report/SaleReportSpec.coffee
 - spec/skr/screens/sales-order/SalesOrderSpec.coffee
 - spec/skr/screens/sku-maint/SkuMaintSpec.coffee
 - spec/skr/screens/time-invoicing/TimeInvoicingSpec.coffee
@@ -608,6 +667,7 @@ files:
 - stockor.gemspec
 - templates/print/fonts/GnuMICR.otf
 - templates/print/layout.tex.erb
+- templates/print/packages/INSTALL
 - templates/print/packages/booktabs.sty
 - templates/print/packages/fancybox.sty
 - templates/print/packages/fancyhdr.sty
@@ -616,10 +676,15 @@ files:
 - templates/print/packages/lastpage209.sty
 - templates/print/packages/marginnote.sty
 - templates/print/packages/multirow.sty
+- templates/print/packages/qrcode.sty
 - templates/print/packages/rotating.sty
+- templates/print/packages/svgnam.def
 - templates/print/packages/tabu.sty
 - templates/print/packages/textpos.sty
 - templates/print/packages/varwidth.sty
+- templates/print/packages/x11nam.def
+- templates/print/packages/xcolor.pro
+- templates/print/packages/xcolor.sty
 - templates/print/partials/address.tex.erb
 - templates/print/partials/bill_to_ship_to.tex.erb
 - templates/print/partials/header.tex.erb
@@ -641,6 +706,7 @@ files:
 - templates/print/partials/so_info_line.tex.erb
 - templates/print/types/invoice/default.tex.erb
 - templates/print/types/invoice/labor.tex.erb
+- templates/print/types/invoice/ticket.tex.erb
 - templates/print/types/payment/default.tex.erb
 - templates/print/types/sales-order/default.tex.erb
 - tmp/.gitkeep