Rob Harrington
465649475d
Revoke ability to overide variants based on shared management/ownership (ie. only explicit permissions)
2016-03-02 12:10:49 +11:00
Rob Harrington
186d1c1f26
Revoking ability to create variant overrides via OC permission
2016-03-02 12:10:49 +11:00
Rob Harrington
ed40ebace6
Existing Exchange Variants must be explicitly set to true by form data to remain in an exchange when an order cycle is updated
2016-03-02 12:10:22 +11:00
Rohan Mitchell
e16ca82e76
Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.
2016-03-02 12:10:22 +11:00
Rob Harrington
59745fbc73
EnterpriseFees can inherit tax_category from product
2016-03-02 11:56:46 +11:00
Rob Harrington
69ee1a98a7
EnterpriseFeeCalculator return empty list when retrieving applicators without distributor or order_cycle being present
2016-03-02 11:56:46 +11:00
Rob Harrington
137003c671
Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false
2016-03-02 11:56:46 +11:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
2016-01-13 18:49:33 +11:00
Maikel Linke
030f4f63ed
SingleSignOn controller with routes and config
2016-01-07 12:58:30 +11:00
Maikel Linke
09086b8dd8
Reference implementation of SSO from Discourse
2016-01-06 15:39:41 +11:00
Rob Harrington
e67e22ee73
Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security
...
Conflicts:
lib/open_food_network/xero_invoices_report.rb
2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2
Restricting access to orders within Sales Tax Report
...
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e
Restricting access to orders within Xero Invoices Report
...
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
4b5e33d5b0
Implementing new permissions for producers in reports_controller_spec
2015-12-17 14:21:30 +11:00
Rob Harrington
2f2ebf419c
Fixing customer info security for packing reports
2015-12-17 14:21:30 +11:00
Rob Harrington
2f13ab6adf
Fixing customer info security for orders and fulfillments report
2015-12-17 14:21:29 +11:00
Rob Harrington
b121984e76
Fixing customer info security for bulk coop report
2015-12-17 14:21:29 +11:00
Rob Harrington
199a3c38f9
Bill is capped before tax is applied, like we say it is
2015-12-16 19:18:58 +11:00
Rob Harrington
76d4f74f6b
Ammending BillablePeriod spec to be ensure tax is charged correctly
2015-12-16 19:18:58 +11:00
Rob Harrington
ca3c464fda
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
2015-12-16 19:18:57 +11:00
Rob Harrington
5b72f53738
Adding helper for describing monthly billing charges
2015-12-16 19:18:57 +11:00
Rob Harrington
044e423543
Adding update logic to business model config controller
2015-12-16 19:18:57 +11:00
Rob Harrington
18ea0c1717
Pulling VariantOverride scoping down into products and inventory report base
2015-12-16 14:23:43 +11:00
Rob Harrington
2bb85eb8e0
Revert "Add SKU to LettuceShare report"
...
This reverts commit 15ea64b409
2015-12-16 13:42:58 +11:00
Rob Harrington
5d28a7fdf8
Adding SKU to Products and Inventory reports (except lettuceshare)
2015-12-16 13:37:19 +11:00
Rob Harrington
befc558224
Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name
...
Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items
2015-12-16 11:55:24 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Em-AK
fcc328f00a
Display default xero invoice dates
...
fixes #682
* pre-fill the invoice_date and due_date in the xero report generation form
* increase the default period between invoice_date and due_date to 1 month in
XeroInvoiceReport
2015-12-13 16:42:32 +01:00
Maikel Linke
758b1f8e64
using in_stock? to filter variants in lettuceshare report
2015-12-11 15:12:28 +11:00
Maikel Linke
bb58473b90
Consider variant overrides in LettuceShare report
2015-12-11 15:12:28 +11:00
Maikel Linke
1d46c2febd
LettuceShare report: display only if count_on_hand > 0
...
Use the inventory of a distributor if selected.
2015-12-11 15:12:27 +11:00
Maikel Linke
15ea64b409
Add SKU to LettuceShare report
2015-12-11 15:12:27 +11:00
Maikel Linke
6787709693
LettuceShare report: total in unit value column and total blank
2015-12-11 15:12:27 +11:00
Rohan Mitchell
5579fa5e0b
Extract last used address finding into service object
2015-12-11 13:06:59 +11:00
Continuous Integration
ae945ace9d
Auto-merge from CI [skip ci]
2015-12-11 11:09:54 +11:00
Rohan Mitchell
9d5606a4fd
Fix enterprise index page 500
2015-12-11 10:06:07 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rohan Mitchell
1e397a41ae
Refactor to simplify outgoing_exchange_variant_ids
2015-12-10 09:17:25 +11:00
Rohan Mitchell
243ef4ee16
When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8c0a82f26f
Provide issues summary for enterprises, pass enterprises through to controller
2015-12-10 09:17:25 +11:00
Rohan Mitchell
93c42d24c7
Extract issue detection into service object
2015-12-10 09:17:25 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rob H
baeacfb8a9
LineItem inherits display_name from variant
...
Allows line_items to be named correctly.
2015-11-29 17:25:28 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Maikel Linke
5d5fda3a25
Merge remote-tracking branch 'origin/master' into i18n
...
Conflicts:
config/locales/en.yml
2015-11-13 10:07:29 +11:00
Rob Harrington
a96cdd5ee7
Merge branch 'master' into line_item_naming
...
Conflicts:
app/views/admin/order_cycles/edit.html.haml
2015-11-13 09:54:26 +11:00
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rohan Mitchell
e20d8d3e95
Merge branch 'master' into folklabs-producer-emails
2015-11-11 14:20:25 +11:00
Rohan Mitchell
46a9304ae1
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
2015-11-11 11:53:04 +11:00
