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
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
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
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
Rohan Mitchell
a78d8fa6af
Build exchange form on front-end
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
036ffeb634
Enterprise service splits enterprises into hubs and producers
2015-12-10 09:17:25 +11:00
Rohan Mitchell
3dcbdad088
Show/hide all products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
7820c31976
Show supplier as secondary in information hierarchy
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d314f07887
Use flexbox to more neatly lay out order cycle products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
2efaedc225
Add .exchange-products container div, fill full row with products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
c5e2ed5aa1
Order outgoing products by name
2015-12-10 09:17:24 +11:00
Rohan Mitchell
8f917817b8
Fix broken styles
2015-12-10 09:17:24 +11:00
Rohan Mitchell
a2c0088c91
Do not show flash message if we're performing an async update without reload
2015-12-10 09:17:24 +11:00
Rohan Mitchell
9fef0a9909
When order cycle is updated, display message instead of reloading the page
2015-12-10 09:17:24 +11:00
Rohan Mitchell
29bfac5f54
Order cycle interface may update or update and close
2015-12-10 09:17:24 +11:00
Maikel Linke
1589bd9ac3
Use mail() instead of devise_mail
...
The EnterpriseMailer used `devise_mail` to send confirmation
instructions. That call is more complicated than `mail` and added an
unwanted reply-to header.
2015-12-04 10:37:55 +11:00
Maikel Linke
c4fb4a8510
Removing Suburbs from the code
...
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
2015-12-04 10:37:55 +11:00
Maikel Linke
d5c4da3bf0
Not using Paperclip's to avoid HTTP calls to S3
2015-12-04 10:37:55 +11:00
Maikel Linke
261a464b50
Fixing display of shop list in group producer modal
2015-12-04 10:37:55 +11:00
Maikel Linke
0f2ae79e05
Fixing "Shop for" label on groups producer modal
2015-12-04 10:37:55 +11:00
Maikel Linke
caffdee047
Removing depricated sensor parameter for Google Maps
2015-12-04 10:37:55 +11:00
Rohan Mitchell
d320b2e7d4
Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job
2015-12-02 15:06:38 +11:00
Rohan Mitchell
e8ccd35363
Simplify producer email to make it more generic
2015-12-02 15:05:49 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rohan Mitchell
10edb2b056
Fix delayed job startup - prevent error caused by double load
2015-12-02 10:48:50 +11:00
