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
Maikel Linke
8bfe459241
i18n fixes of html display
2015-11-13 14:22:17 +11:00
Rohan Mitchell
bb6fb2f5e8
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
2015-11-13 14:03:32 +11:00
Rohan Mitchell
6de44877c8
Update link for uber-style sell food dropdown
2015-11-13 14:03:14 +11:00
Rohan Mitchell
888e4d80ef
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
2015-11-13 14:03:07 +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
Rob Harrington
34030276d7
Cleaning up line items index (BOM)
2015-11-12 10:06:21 +11:00
Rob Harrington
330977186e
Using confirm-change and select2-min-search directive for line items index
2015-11-12 10:05:14 +11:00
Rob Harrington
fc57255b40
Adding save-bar to line items index
2015-11-12 10:04:18 +11:00
Rob Harrington
266820742d
Using request monitor on line items index (BOM)
2015-11-12 10:03:28 +11:00
Rob Harrington
193325f81b
Improve formatting around saving on line items index (BOM)
2015-11-12 09:52:10 +11:00
Rob Harrington
5a7cac652c
Adding confirm-link directive
2015-11-12 09:49:36 +11:00
Rohan Mitchell
e20d8d3e95
Merge branch 'master' into folklabs-producer-emails
2015-11-11 14:20:25 +11:00
Rohan Mitchell
fb3e292e20
Formatting
2015-11-11 11:53:04 +11:00
Rohan Mitchell
a32321df68
Clarify label
2015-11-11 11:53:04 +11:00
Rohan Mitchell
727ecae62b
Admin can modify a taxed adjustment on an order
2015-11-11 11:53:04 +11:00
Rohan Mitchell
85e45fa558
Use select2
2015-11-11 11:53:04 +11:00
Rohan Mitchell
d794981ecf
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
2015-11-11 11:53:04 +11:00
Rob Harrington
330882c689
Pulling out styling for red buttons in admin into more generic .red class
2015-11-06 09:52:48 +11:00
Rob Harrington
66d1e4297e
WIP: Renaming admin.order_cycles to admin.orderCycles for consistency
2015-11-05 14:40:42 +11:00
Maikel Linke
5e59048705
i18n typo
2015-11-05 14:39:33 +11:00
Maikel Linke
8b29612614
Merge remote-tracking branch 'origin/master' into i18n
2015-11-05 11:54:06 +11:00
Rob Harrington
d731d4e803
Making sure flash is a hash so that is can be used to initialize OpenStuct
2015-11-05 11:09:21 +11:00
Rohan Mitchell
65589d25c6
Display more verbose product and variant name
2015-11-05 09:50:00 +11:00
Rohan Mitchell
5ffad4d343
Fix quantity calculation
2015-11-05 09:43:44 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +11:00
Rohan Mitchell
a3d638df67
Merge branch 'master' into folklabs-producer-emails
2015-11-04 11:15:01 +11:00
Lynne Davis
7350dbb75e
Adding tweaks that have been missed from merges
2015-10-30 11:54:06 +11:00
Maikel Linke
4eed222f18
Fixed several i18n issues reported by Myriam
2015-10-29 14:55:38 +11:00
Rohan Mitchell
f63a80300b
Merge branch 'master' into folklabs-producer-emails
2015-10-29 11:49:24 +11:00
Rohan Mitchell
87cf3eda41
Amend 'Detailed orders breakdown' heading with missing content
2015-10-29 11:48:12 +11:00
Rob Harrington
cb1f79f59a
Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants
2015-10-28 15:42:14 +11:00
Rob Harrington
18a7317185
Merge branch 'account-invoices' into line_item_naming
...
Conflicts:
app/models/spree/line_item_decorator.rb
2015-10-28 13:42:27 +11:00
Rob Harrington
c5810fc003
Improving BOM form validation
2015-10-28 13:08:50 +11:00
Rob Harrington
ab7bfd10c5
Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"
...
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.
Conflicts:
lib/open_food_network/order_and_distributor_report.rb
spec/features/admin/variants_spec.rb
spec/lib/open_food_network/order_and_distributor_report_spec.rb
2015-10-28 13:08:50 +11:00
Rob Harrington
21e5895a8a
Group Buy panel on BOM takes changes to final_weight_volumes into account
2015-10-28 13:07:32 +11:00
Rob Harrington
33e1322a44
Adding form validation to BOM
2015-10-28 13:07:32 +11:00
Rob Harrington
b08556ec7f
WIP: Making final_weight_volume adjustment a bit nicer
2015-10-28 13:07:31 +11:00
