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
72f7e545dc
Making sure bill > 0 for finalize account invoice spec
2015-12-17 12:04:24 +11:00
Rob Harrington
555f639026
Fixing unstable update_account_invoice specs
...
Rounding first then summing != summing first then rounding
2015-12-17 09:16:19 +11:00
Rob Harrington
26a2f1a280
Adjustments on account invoices are created based on presence of a bill
...
Rather than of turnover
2015-12-16 23:10:47 +11:00
Rob Harrington
fe0652e243
When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value
2015-12-16 19:18:59 +11:00
Rob Harrington
f49722ba90
Fixing broken BMC specs
2015-12-16 19:18:58 +11:00
Rob Harrington
0370723edd
Attempt to add a sensible name and contact number to Account Invoice addresses
2015-12-16 19:18:58 +11:00
Rob Harrington
d46712de84
Obsolete BillablePeriods only deleted if their associated order is not already complete
2015-12-16 19:18:58 +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
85f61364f8
BillablePeriods use global config to calculate bills
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
da325780b1
Adding BMC link to configurations menu
2015-12-16 19:18:57 +11:00
Rob Harrington
a40a03905f
Reorganising BMC edit view
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
e20b06bb97
Adding basic route and controller for business model configuration
2015-12-16 19:18:56 +11:00
Rob Harrington
cc4f9dd09b
Making lettuceshare report spec more robust
2015-12-16 18:14:19 +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
Rob Harrington
c91f1301f0
Adding preferences to enterprises for sorting of order cycles in shopfront list
2015-12-16 11:55:23 +11:00
Rob Harrington
e6a51bb49d
Adding actions dropdown to admin order view/pages
2015-12-16 11:55:23 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Em-AK
81f244025f
Update due_date in feature test
...
due_date = invoice_date + 1 month
2015-12-13 18:42:27 +01: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
a3874d42af
Spec moved to OpenFoodNetwork::LastUsedAddress
2015-12-11 13:25:40 +11:00
Rohan Mitchell
3f8d470d23
When admin associates user with an order, look up last used address
2015-12-11 13:06:59 +11:00
Rohan Mitchell
ae3061df80
All orders specs use JS
2015-12-11 13:06:59 +11:00
Rohan Mitchell
5579fa5e0b
Extract last used address finding into service object
2015-12-11 13:06:59 +11:00
Rohan Mitchell
e33ede0ec2
Include order cycle status in new order form
2015-12-11 13:06:58 +11:00
Rohan Mitchell
76d4fbccf9
Use select2 for order cycle selection
2015-12-11 13:06:58 +11:00
Rohan Mitchell
60e971ad63
Take variant overrides into account for price when admin adds line item to order
2015-12-11 13:06:57 +11:00
Rohan Mitchell
222b390b31
Fix error display
2015-12-11 13:06:57 +11:00
Rohan Mitchell
3419198635
Disable distributors that do not have an order cycle
2015-12-11 13:06:57 +11:00
Rohan Mitchell
1026b81d0c
Do not show order cycle choice until distributor is chosen
2015-12-11 13:06:57 +11:00
Rohan Mitchell
c74463404d
Only show order cycle options that include the chosen distributor
2015-12-11 13:06:57 +11:00
Rohan Mitchell
2081744cf6
Fix spec
2015-12-11 13:06:57 +11:00
Rohan Mitchell
2daceb1111
Angularise new order form
2015-12-11 13:06:57 +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