Rohan Mitchell
|
ab9bc7b1dc
|
Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action
0.7.4
|
2015-03-18 12:50:25 +11:00 |
|
Rohan Mitchell
|
cf4ccc268a
|
Admin may set no tax category on product unless tax category is required
|
2015-03-18 10:12:32 +11:00 |
|
Rohan Mitchell
|
7af17242f9
|
EnterpriseFee admin interface allows selecting no fee
|
2015-03-16 14:05:04 +11:00 |
|
Rohan Mitchell
|
eb5e411a8e
|
Update zeus
|
2015-03-16 14:00:55 +11:00 |
|
Rob Harrington
|
bdeca54377
|
Reloading stale enterprise object in test
|
2015-03-14 16:17:16 +11:00 |
|
Rob Harrington
|
20d59cf5a5
|
Fixing authentication spec to work with altered user factory
|
2015-03-14 11:40:21 +11:00 |
|
Rob Harrington
|
8b241f058b
|
Login to consumer section in a way that ensures user is not an admin
|
2015-03-14 11:02:45 +11:00 |
|
Rob Harrington
|
cb28843af1
|
Reload manager before ensuring owner is a manager
|
2015-03-14 10:41:49 +11:00 |
|
Rob Harrington
|
d684a88697
|
Merge branch 'order-confirmation' into ready-to-merge
|
2015-03-13 18:11:53 +11:00 |
|
summerscope
|
d0f66a6053
|
Fixing label for cart popover to make it write name of product variant without page load
|
2015-03-13 18:10:59 +11:00 |
|
summerscope
|
d2fbf9f14d
|
Fixing logic for instance where collection instructions are not entered
|
2015-03-13 18:00:36 +11:00 |
|
Rohan Mitchell
|
8d3f25bb39
|
Fix intermittent 500 error when updating the cart
|
2015-03-13 17:50:01 +11:00 |
|
Rohan Mitchell
|
abaaf05631
|
Merge branch 'user-menu'
|
2015-03-13 17:00:37 +11:00 |
|
Rob Harrington
|
dd8c769ea9
|
Hiding fee breakdown on cart page for now
|
2015-03-13 16:50:57 +11:00 |
|
summerscope
|
864c9ec1da
|
This changes the user menu labels to show Account next to user email.
Small tweak to user account page to make it less awful.
|
2015-03-13 16:49:26 +11:00 |
|
Rob Harrington
|
b0cfa6a17c
|
Shipping method prices displayed next to options in checkout
|
2015-03-13 16:18:49 +11:00 |
|
Rob Harrington
|
51258b242c
|
Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation
|
2015-03-13 16:07:17 +11:00 |
|
Rohan Mitchell
|
1a44e74a9d
|
When enterprise user creates an enterprise, make it a hub if they have other hubs
|
2015-03-13 16:06:42 +11:00 |
|
Rohan Mitchell
|
efbf2c7ffa
|
Display extended variant name in quick cart
|
2015-03-13 12:58:53 +11:00 |
|
Rohan Mitchell
|
6365434a94
|
Merge branch 'lin-d-hop-ordercyclemanagementreports2'
|
2015-03-13 10:53:03 +11:00 |
|
Rohan Mitchell
|
d9f90be38a
|
Fix indentation
|
2015-03-13 10:52:44 +11:00 |
|
Rohan Mitchell
|
008b43b1fc
|
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
|
2015-03-13 10:47:49 +11:00 |
|
Rohan Mitchell
|
5609354136
|
Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs
|
2015-03-13 10:45:38 +11:00 |
|
Lynne Davis
|
d9e8ce2f0e
|
Fix bug in report that selecting multiple payment methods didn't work. Added spec as well
|
2015-03-12 17:16:51 +11:00 |
|
Rob Harrington
|
cce65aa462
|
Merge remote-tracking branch 'origin/master' into order-confirmation
|
2015-03-12 16:20:21 +11:00 |
|
Rob Harrington
|
44511b8b61
|
Only display shipping description if it exists
|
2015-03-12 16:18:30 +11:00 |
|
Rob Harrington
|
eb413ccc84
|
Committing schema changes
|
2015-03-12 16:18:07 +11:00 |
|
Rob Harrington
|
6cd6b751c8
|
Merge branch 'master' into order-confirmation
|
2015-03-12 15:34:49 +11:00 |
|
Rohan Mitchell
|
af95181245
|
Merge branch 'lin-d-hop-ordercyclemanagementreports2'
|
2015-03-12 12:30:49 +11:00 |
|
Rohan Mitchell
|
36fa4896ed
|
Syntax
|
2015-03-12 12:28:35 +11:00 |
|
Rohan Mitchell
|
7c723c04b6
|
Show yes/no instead of true/false
|
2015-03-12 12:23:02 +11:00 |
|
Rohan Mitchell
|
c85d5b86eb
|
Fix temperature_controlled migration - NOT NULL requires default value
|
2015-03-12 12:22:51 +11:00 |
|
Rohan Mitchell
|
1a97df1d21
|
Fix whitespace issues
|
2015-03-12 12:17:15 +11:00 |
|
Rohan Mitchell
|
a5716cf2c2
|
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
|
2015-03-12 12:15:22 +11:00 |
|
Rohan Mitchell
|
b4e990a081
|
Merge branch 'reduce-supplier-list-in-order-cycles'
|
2015-03-12 11:55:46 +11:00 |
|
Rohan Mitchell
|
eccd97fc28
|
Merge branch 'master' into reduce-supplier-list-in-order-cycles
|
2015-03-12 11:55:14 +11:00 |
|
Rohan Mitchell
|
c4d4d10873
|
Reuse supplier/distributor list
|
2015-03-12 11:53:13 +11:00 |
|
Rohan Mitchell
|
1e5e009735
|
Spree init works when database has not been created, remove duplicate FK from db/schema.rb
|
2015-03-12 11:29:01 +11:00 |
|
summerscope
|
ea96759306
|
Take styling out of template into SASS
|
2015-03-10 14:59:46 +11:00 |
|
summerscope
|
d967905b83
|
Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos
|
2015-03-10 14:59:26 +11:00 |
|
summerscope
|
f698408d40
|
Logic for delivery vs collection - making template
|
2015-03-10 14:58:58 +11:00 |
|
summerscope
|
75b0b290ae
|
More WIP trying to work on the cart template logic with Rohan
|
2015-03-10 14:12:43 +11:00 |
|
summerscope
|
21b18a8cc5
|
WIP commit so i can see what i messed up.
|
2015-03-10 12:31:53 +11:00 |
|
summerscope
|
91bf588bcc
|
Order details page add in mini thumbnail for product image
|
2015-03-10 12:03:21 +11:00 |
|
summerscope
|
a8de4dc039
|
WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.
|
2015-03-10 11:35:53 +11:00 |
|
summerscope
|
c7cf9695bc
|
WIP on cart menu trying to add the master name back in where a product has variante
|
2015-03-10 11:35:35 +11:00 |
|
summerscope
|
b9a0579397
|
Add styling for image thumbnail - hide for small, show small thumbnail for big screens.
|
2015-03-10 11:35:03 +11:00 |
|
summerscope
|
de6abc3464
|
Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere.
|
2015-03-10 11:34:31 +11:00 |
|
summerscope
|
881313edf9
|
Changing the logic on Shipping accordion on checkout to try to show shipping price against option. Not working.
|
2015-03-06 16:05:42 +11:00 |
|
Rohan Mitchell
|
381bfd383b
|
Allow enterprise fee with no tax category
|
2015-03-06 12:12:33 +11:00 |
|