Rohan Mitchell
a3a3832c8d
Only show products that the chosen hub can add to an order cycle
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7
Inject hub permissions - which producers each hub can add to order cycle
2014-12-12 13:33:12 +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
b9011d9abe
Remove obsolete spree checkout views
2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346
Revert "Removing obsolete checkout views"
...
This reverts commit d0e013c1a5
2014-12-11 16:09:17 +11:00
Rob Harrington
d0e013c1a5
Removing obsolete checkout views
2014-12-11 14:50:29 +11:00
Maikel Linke
440044372b
Leave-page-warning only after changing inputs
...
The enterprise form is now set 'dirty' whenever an input changes. The
navigation callback confirms to leave the page only if the form is
dirty.
2014-12-11 14:27:08 +11:00
Maikel Linke
76739a4746
Unify nav-check and nav-callback attributes in nav-check-callback
...
The value of nav-check was not used and nav-callback was only important
if nav-check was given. So we need only one attribute, now named
nav-check-callback.
2014-12-11 12:14:51 +11:00
Maikel Linke
27896534f0
Navigation Callbacks (confirmation to leave) refs
...
A navigation callback could give only a fixed value at load time. Now it
can act depending on the site's state just before the page is unloaded.
2014-12-11 12:05:59 +11:00
Maikel Linke
7b41d4c5d4
Denoting the product category as required
...
Using common style: span.required *
2014-12-05 14:56:32 +11:00
Rohan Mitchell
50e26ed96f
Remove old required partial
2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a
Merge branch 'master' into enterprise-form-required-fields
...
Conflicts:
app/views/admin/enterprises/_form.html.haml
app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
3358fb3d73
Name based on meaning instead of context
2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8
Localize more strings on home page.
2014-12-03 09:39:36 +11:00
Rob Harrington
258573f5a6
Remove obsolete text version of user signup_confirmation
2014-11-26 18:58:26 +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
8f27c643f1
Move override for cart line item into existing view replacement
2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9
Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry
2014-11-26 15:16:53 +11:00
Rob Harrington
f5acf36771
Hiding enterprise shop url in ent welcome email, as that may bot actually make sense
2014-11-26 14:50:19 +11:00
Rob Harrington
f6b0863279
Make cost breakdowns consistent throughout checkout
2014-11-26 13:07:40 +11:00
Rob Harrington
c4961d2502
Whitespace crusader
2014-11-26 11:59:22 +11:00
Matt-Yorkley
4f153714a8
Reports pages improvements and i18n
2014-11-23 17:26:26 +00:00
Matt-Yorkley
451dd3966f
form partial
2014-11-23 15:22:56 +00:00
Rob Harrington
9bd3909449
Merge master into pretty-emails
2014-11-21 14:43:01 +11:00
Rob Harrington
2f28312f7e
Removing incorrectly placed directive in profile shops skinny view
2014-11-21 14:18:22 +11:00
Rohan Mitchell
0b030a85ff
Incrementally load products
2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f
Display products in table
2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1
User can select a hub
2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720
Do not show producers in hubs list
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31
Show list of hubs to select for managing variant overrides
2014-11-21 13:49:09 +11:00
Rohan Mitchell
7e4d337773
Extract DisplayProperties to a service
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc
In BPE, rename producer and category JSON attrs to producer_id and category_id
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2014-11-21 08:41:41 +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
c310a3bdaa
Don't use svg for email header
2014-11-20 20:14:57 +11:00
Rob Harrington
46462a1abb
Format fiddling in user signup confirm email
2014-11-20 20:13:54 +11:00
Rohan Mitchell
76c300283b
Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon
2014-11-20 15:59:06 +11:00
Rob Harrington
3d98ec6eef
Stripping out inline styles from enterprise email templates
2014-11-20 15:51:28 +11:00
Rob Harrington
4dd5e51ed5
Stripping out inline styles from user signup email template
2014-11-20 15:48:36 +11:00
Rob Harrington
f5a5b93c22
Can use relative paths for assets in emails because roadie
2014-11-20 15:45:12 +11:00
Rob Harrington
15d157abc0
Stripping out inline styles from email templates
2014-11-20 15:42:03 +11:00
Rohan Mitchell
8096ca2519
Merge remote-tracking branch 'origin/config' into config
2014-11-20 15:41:15 +11:00
Rob Harrington
fe0bb49baf
WIP: Adding templates for different order confirmation emails
2014-11-20 12:06:53 +11:00
Rob Harrington
dd6a5ecd0b
Adding helper for assets in mailer views, fixing links in mailer layout
2014-11-19 16:42:31 +11:00
Lynne Davis
b81bf60dc2
267: Cont. Didn't realise commit -a doesn't add a file
2014-11-18 19:30:44 +00:00
Paul Mackay
375bdc0586
#275 : Change report format. Improved mailer.
2014-11-16 07:14:29 +00:00
Lynne Davis
e89184de02
286: Last sneaky dollar sign. Updated to use spree_number_to_currency
2014-11-14 14:24:22 +00:00
Rob Harrington
8d1facb7c3
Adding revamp of enterprise welcome email by @summerscope
2014-11-14 18:42:16 +11:00
Rob Harrington
0907e2d886
A few alterations to the enterprise email confirmation email
2014-11-14 18:10:40 +11:00
Rob Harrington
d182bb7bf7
Add signoff partial for mailer templates
2014-11-14 18:09:48 +11:00
