Lynne Davis
|
a0f51af355
|
Correcting name tag for order conf email
|
2016-01-25 23:50:53 +00:00 |
|
Rob Harrington
|
75846a4d1f
|
Merge branch 'master' into line_item_naming
|
2015-11-16 10:38:42 +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
|
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
|
795830d94d
|
Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module
|
2015-10-28 13:07:31 +11:00 |
|
Maikel Linke
|
2053fbecda
|
Merge branch 'i18n-replace-strings-in-js' into i18n
Conflicts:
.travis.yml
app/views/spree/order_mailer/confirm_email_for_customer.html.haml
config/locales/en.yml
|
2015-10-21 14:09:43 +11:00 |
|
Rob Harrington
|
6e7fc6a0f7
|
Adding invoice action to orders controller, to allow sending of invoice email
|
2015-10-16 17:25:40 +11:00 |
|
Rob Harrington
|
104b100fe6
|
Pulling distributor signoff out into separate partial
|
2015-10-16 17:25:39 +11:00 |
|
Maikel Linke
|
0b4a43d77a
|
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
|
2015-09-16 16:32:16 +10:00 |
|
Maikel Linke
|
e25805aa78
|
Restoring all changes of the last combined branch
This reverts commit 1e55e8a907.
|
2015-09-10 15:03:13 +10:00 |
|
Maikel Linke
|
1e55e8a907
|
Reverting all changes of the last combined branch
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
|
2015-09-10 12:50:40 +10:00 |
|
Maikel Linke
|
23355d1a25
|
include order email and phone number in email for shop
|
2015-09-03 14:46:08 +10:00 |
|
Maikel Linke
|
85c99102dd
|
i18n: Replacing all language strings in app/view/
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
|
2015-08-28 16:59:23 +10:00 |
|
Rohan Mitchell
|
e843beaf18
|
Remove enterprise address from order confirmation and mailer, since in these contexts the pickup location will be specified elsewhere. #636
|
2015-08-07 14:19:48 +10:00 |
|
Rohan Mitchell
|
08fef890ec
|
Do not show tax lines if there is no tax on the order
|
2015-04-17 13:41:14 +10:00 |
|
Rohan Mitchell
|
a93633a626
|
Show tax on order confirmation emails
|
2015-04-17 13:41:14 +10:00 |
|
Rohan Mitchell
|
4bd1ff2011
|
Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication
|
2015-04-17 13:40:08 +10:00 |
|
summerscope
|
d2fbf9f14d
|
Fixing logic for instance where collection instructions are not entered
|
2015-03-13 18:00:36 +11:00 |
|
summerscope
|
2cdab7af25
|
More label tweaks and logic tweaks to templates
|
2015-03-05 11:26:15 +11:00 |
|
summerscope
|
e6591be55c
|
More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.
|
2015-03-04 17:34:24 +11:00 |
|
summerscope
|
163035dcad
|
Tweaking email template to be more like order confirmation
|
2015-03-04 17:18:37 +11:00 |
|
summerscope
|
b097a62c7a
|
WIP adding variant name logic to the email templates
|
2015-03-04 12:37:57 +11:00 |
|
summerscope
|
2c2352cd4e
|
Final tweaks to different layout use cases for these emails.
|
2015-02-27 17:14:33 +11:00 |
|
summerscope
|
12bfb9301a
|
More updates dealing with pick up instructions.
|
2015-02-27 17:09:59 +11:00 |
|
summerscope
|
ba0d4c2111
|
More order confirmation email updates. Making language correct for hub vs user.
|
2015-02-27 16:55:36 +11:00 |
|
summerscope
|
4eee86a240
|
Tweak label
|
2015-02-27 16:09:14 +11:00 |
|
summerscope
|
587e4ae86d
|
WIP getting all the confirmation details right for collection, delivery, etc.
|
2015-02-27 16:08:20 +11:00 |
|
summerscope
|
87842ecaf5
|
More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.
|
2015-02-27 14:00:49 +11:00 |
|
summerscope
|
2ba632456f
|
WIP email mailer updates for customer email confirmation etc.
|
2015-02-27 12:40:13 +11:00 |
|
Rob Harrington
|
6a226e4f92
|
Fixing typos and changing delivery address display in order confirmation email
|
2014-12-12 12:00:15 +11:00 |
|
Rob Harrington
|
0cf2df8358
|
Remove obsolete text version of order confirm_email
|
2014-11-26 18:54:50 +11:00 |
|
Rob Harrington
|
8a3bffb37d
|
Cart page conforms to convention in rest of checkout, adjusting helpers through checkout
|
2014-11-26 18:53:29 +11:00 |
|
Rob Harrington
|
f6b0863279
|
Make cost breakdowns consistent throughout checkout
|
2014-11-26 13:07:40 +11:00 |
|
Rob Harrington
|
ebaaf2a136
|
Display line items in confirmation email with fees included in item totals
|
2014-11-20 20:17:18 +11:00 |
|
Rob Harrington
|
15d157abc0
|
Stripping out inline styles from email templates
|
2014-11-20 15:42:03 +11:00 |
|
Rob Harrington
|
fe0bb49baf
|
WIP: Adding templates for different order confirmation emails
|
2014-11-20 12:06:53 +11:00 |
|
Rafael Schouten
|
ff4f8f63af
|
Merge branch 'master' into raf_bugfix
Conflicts:
app/views/spree/order_mailer/confirm_email.text.haml
|
2014-10-02 19:06:30 +10:00 |
|
Rafael Schouten
|
a2dff2305f
|
space in order confirm mailer
|
2014-09-30 19:39:56 +10:00 |
|
Rafael Schouten
|
dee869a273
|
move checks and links in sidebars
|
2014-09-26 17:58:00 +10:00 |
|
Rafael Schouten
|
92a40fc842
|
order mailer edits
|
2014-09-26 17:21:41 +10:00 |
|
Rafael Schouten
|
83b19ee632
|
fix haml and formatting on confirm email
|
2014-09-17 16:56:44 +10:00 |
|
Rafael Schouten
|
79fd8ed98b
|
dubug mail template
|
2014-09-17 15:37:38 +10:00 |
|
Rafael Schouten
|
b6fd3a11fa
|
remove old mailer
|
2014-09-17 11:54:06 +10:00 |
|
Rafael Schouten
|
f79dfed6ef
|
use haml for mailer
|
2014-09-17 11:53:47 +10:00 |
|
Rob H
|
115d8e0d6e
|
Smoosh distributions up into cart item subtotal in order confirmation email
|
2014-08-08 17:50:00 +10:00 |
|
Rohan Mitchell
|
3dd7b296be
|
Show order notes (special instructions) on report and confirmation email
|
2014-07-24 15:13:23 +10:00 |
|
Rob H
|
a668a4fd55
|
Further tidy-up for order confirmation email
|
2014-06-20 12:21:33 +10:00 |
|
Rob H
|
bd13b2b3fc
|
Add shipping method description to confirmation email, cleanup
|
2014-06-19 17:52:25 +10:00 |
|
Will Marshall
|
96913ad922
|
Changing the order confirmation text with Kirsten
|
2014-04-11 13:33:13 +10:00 |
|
Will Marshall
|
fcb04481c4
|
Fixing a nil chain bug
|
2014-04-08 17:55:09 +10:00 |
|