Rob Harrington
261a574da9
Tweaking styling on enterprise change form, and dashboard header row
2016-09-07 11:13:48 +10:00
Rob Harrington
be51a55f16
Only display shopfront trial message on dashboard page. Fixes #1120
2016-09-02 13:45:49 +10:00
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +10:00
Maikel Linke
c34e9c046b
Remove quotes around url
2016-08-17 16:44:27 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +10:00
Rohan Mitchell
6f947380cb
Remove unused overrides and views
2016-07-29 09:18:31 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
Maikel Linke
f984871b23
Inject only needed enterprises into cart and checkout
2016-07-06 11:14:13 +10:00
Lynne
4da7668dfc
Merge pull request #1048 from lin-d-hop/sign_up_email_i18n
...
code cleanup
2016-06-23 15:30:42 +01:00
Lynne Davis
9c29e56fc3
More typo
2016-06-21 17:44:45 +01:00
Lynne Davis
e253590c1c
code cleanup
2016-06-21 17:07:42 +01:00
Lynne
43b5216002
Merge pull request #1046 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
2016-06-20 18:45:31 +01:00
Lynne Davis
fa52712e35
More syntax fixes
2016-06-20 18:32:32 +01:00
Lynne
36093c0f64
Merge pull request #1045 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
Merging so that I can test emails on UK staging.
2016-06-20 17:29:37 +01:00
Lynne Davis
98548e15c5
I18n of enterprise emails
2016-06-20 15:18:25 +01:00
Continuous Integration
9ba07a2afb
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-15 11:26:02 +10:00
Bing Xie
82dc2a8c98
Update bulk products editing page
2016-06-15 10:51:34 +10:00
Bing Xie
860a537f30
Add save bar to bulk editing product page
2016-06-15 10:51:34 +10:00
Maikel Linke
cb679a6aba
Remove duplicate "What's this?" from order cycles overview
2016-06-10 09:18:26 +10:00
Rob Harrington
4d83bf2135
Payment methods can be tagged
2016-05-27 16:25:10 +10:00
Rob Harrington
385fd91e70
Adding angularjs payment method controller, updating payment method edit form
2016-05-27 16:25:10 +10:00
Rob Harrington
b9f6cb8800
Adding translations for all column names
2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474
Default column visibility can be set per user using ColumnPreferences model
2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a
Refactoring save-bar
2016-05-25 08:10:20 +10:00
Rob Harrington
8838a89ecc
Don't typecast product and variant on_hand from DOM when it is 'On demand'
2016-05-25 08:10:20 +10:00
Rob Harrington
e5ca494db8
Replacing bindonce with native Angularjs syntax in Darkswarm
...
Involved changing bo-text -> ng-bind, bo-href-i -> ng-href, bo-src-i -> ng-src and ng-html -> ng-bind-html
2016-05-25 08:10:20 +10:00
Rob Harrington
6a610ff7a4
Merge remote-tracking branch 'origin/master' into uk/trial-length
2016-05-20 12:22:47 +10:00
Bing Xie
f8ec0d316a
Save bar can support cancel button
2016-05-12 11:04:40 +10:00
Bing Xie
78b4a35d12
Keep the action with save button
2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7
Use save_bar on order cycle update form
2016-05-12 10:45:41 +10:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Rohan Mitchell
88e9eb59cf
Do not allow invalid quantity to reach model, triggering server update
2016-04-29 11:56:48 +10:00
Rohan Mitchell
1384140e41
Notify when stock limit reached on cart rather than silently capping
2016-04-27 15:10:54 +10:00
Rohan Mitchell
36f4df2931
Allow max value in cart of what's on hand
2016-04-27 12:27:24 +10:00
Rohan Mitchell
cf40e0432a
When cart is updated with insufficient stock, show amount in cart, not amount entered
2016-04-27 12:27:24 +10:00
Lynne Davis
51629cd0c0
Adding translations for shop front trials
2016-04-15 16:55:06 +01:00
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3
Add failed payments, update spec
2016-04-15 08:26:12 +01:00
elf Pavlik
f15e948085
small i18n fixes #878
2016-04-14 16:10:21 -05:00
Steve Pettitt
1483023769
Add a sweet warning sign
2016-04-10 22:48:38 +01:00
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
Maikel Linke
17f168ed06
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances
...
Applied code conventions.
Conflicts:
config/locales/en.yml
2016-03-30 13:30:44 +11:00
stveep
d67db76b88
Formatting credit/debit green/red
2016-03-28 20:35:14 +01:00
elf Pavlik
6d0dc438a7
i18n fixes after @sstead feedback in #799
2016-03-21 16:55:57 -06:00
Steve Pettitt
e81ef564e3
Capitalize Spree state translations
2016-03-11 22:01:09 +00:00
Maikel Linke
2546603a67
Remove what_is_this from locale
...
It got replaced by admin.whats_this.
Changed views to use the new key.
2016-03-11 17:08:13 +11:00
