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
Rob Harrington
ae0ad73b4a
Printable Invoices Improvements for Food Connect
...
Adding cusotmer instructions, hiding tax column when not present, order cycle name appears at top of invoice and items are sorted by product name
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
932ac45ea5
Do not show form until distribution has been chosen
2015-12-11 13:06:57 +11:00
Rohan Mitchell
80ebaece2d
Sort distribution choices by name
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
cbaf2a0cb3
Angularise edit order form
2015-12-11 13:06:57 +11:00
Rohan Mitchell
6e7b6b5dfc
Tidy render partial calls and hash syntax
2015-12-11 13:06:57 +11:00
Rohan Mitchell
815694de31
Move orders/edit template from Spree
2015-12-11 13:06:57 +11:00
Rohan Mitchell
2daceb1111
Angularise new order form
2015-12-11 13:06:57 +11:00
Rohan Mitchell
eb07680f1f
Inject shops and order cycles
2015-12-11 13:06:57 +11:00
Rohan Mitchell
47c23c986a
Move distribution fields from override to partial
2015-12-11 13:06:56 +11:00
Rohan Mitchell
742e2279ae
Tidy render partial calls
2015-12-11 13:06:56 +11:00
Rohan Mitchell
eaae16a486
Copy orders/new template from Spree
2015-12-11 13:06:56 +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
ee447c9ce6
Move blankOption service to admin.utils module
2015-12-10 09:35:27 +11:00
Rohan Mitchell
eba2aae353
Copy StatusMessage to admin.utils module, eventually to be moved here
2015-12-10 09:32:04 +11:00
Rohan Mitchell
c1a80b1e8f
Require confirmation when saving an order cycle without distributors
2015-12-10 09:17:25 +11:00
Rohan Mitchell
6998df25e0
Fix indentation
2015-12-10 09:17:25 +11:00
Rohan Mitchell
921210012a
Swap in StatusMessage service for custom message display in order cycles interface
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8d270e919f
Sort exchanges for display when editing an order cycle
2015-12-10 09:17:25 +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
ea6974d438
Add OrderCycle#supplied_variants
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ccb23cd186
Do not allow re-adding exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d4ee20455e
Remove enterprise options from list when added
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ef603a070e
Add methods to check for novel suppliers and distributors in an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
1a4448c6d2
Do not allow adding blank enterprises
2015-12-10 09:17:25 +11:00
