Christian
839bf8794f
Fix a hard cocded string on Order summary screen
...
Created an order_pickup_time entry in locale files.
2016-01-07 07:06:26 +01:00
Christian
823a6bff5b
Use config to get logo in mails
...
Use ContentConfig.footer_logo to get localized logo file instead of
defaut AUS logo.
2015-12-24 11:31:47 +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
e0da49e4df
Formatting dates for account invoices in rails time zone
2015-12-17 11:34:06 +11:00
Rob Harrington
b004060679
Printing invoices doesn't fail when order has no order cycle
2015-12-17 11:33:18 +11:00
Rob Harrington
83e3fb98f7
Only display billable period adjustments where the amount in > 0
...
Rather than where the bill (which is calculated according to current settings) is > 0
2015-12-16 19:18:59 +11:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
0ed8cf973d
Adding an example bill calculator to business model config edit page
...
To allow super admin to see the effects of any changes they make to BMC settings
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
c1d04af5cc
Implementing monthly billing description logic in required pages
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
cb9b61f393
WIP: Adding an edit view for BMC variables
2015-12-16 19:18:56 +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
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
Rohan Mitchell
76d4fbccf9
Use select2 for order cycle selection
2015-12-11 13:06:58 +11:00
Rohan Mitchell
932ac45ea5
Do not show form until distribution has been chosen
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
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
921210012a
Swap in StatusMessage service for custom message display in order cycles interface
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
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
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
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
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
d5c4da3bf0
Not using Paperclip's to avoid HTTP calls to S3
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
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
Rob Harrington
33454a7090
Adding server validation errors messages to BOM interface
2015-11-18 14:32:29 +11:00
Rob Harrington
6268b7cc7e
Printing/sending an invoice uses the same template for generating a pdf
2015-11-18 10:02:51 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
