Commit Graph

410 Commits

Author SHA1 Message Date
Will Marshall
2ff2d3dcbd Starting to work on test format 2014-05-01 15:51:40 +10:00
Will Marshall
8a5b93ace9 Adding a couple of basic feature tests for the sake of demonstration 2014-04-30 16:10:02 +10:00
Will Marshall
0f6bd7049c Starting to build out producers Angular page 2014-04-30 12:52:47 +10:00
Will Marshall
e7d6e7e564 Removing the sidebar before filter stuff, since we're not using it anymore 2014-04-30 12:15:57 +10:00
Will Marshall
4ca148ee93 Starting on the producers controller 2014-04-30 12:05:53 +10:00
Will Marshall
c33fa03736 Merging into master 2014-04-29 10:35:05 +10:00
Will Marshall
f9b7b602da Moving from darkswarm to home 2014-04-24 16:53:00 +10:00
Rohan Mitchell
b649d6ef69 Authorise access to OrderCycles API 2014-04-24 13:20:16 +10:00
Rohan Mitchell
7931a2e8da Test managed products API access for all user types 2014-04-24 13:20:16 +10:00
Rohan Mitchell
6c86254a90 Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user 2014-04-24 13:20:16 +10:00
Rohan Mitchell
e6d988ff34 Nest variant soft delete route under product resource 2014-04-24 13:20:16 +10:00
Rohan Mitchell
e28a450875 Add API call to soft-delete a variant 2014-04-24 13:20:16 +10:00
Will Marshall
16251fe5ea Merging with master 2014-04-23 14:43:39 +10:00
Rob H
131b4ac073 Hack fix for our API controllers not being able to access Spree's Rabl Responder 2014-04-23 12:31:30 +10:00
Rob H
b37a701d39 Merge branch 'api_fixes' into bom 2014-04-23 12:03:01 +10:00
Rob H
353b26c3df Hack fix for our API controllers not being able to access Spree's Rabl Responder 2014-04-23 12:02:11 +10:00
Will Marshall
99d743f7cf Some very basic specs 2014-04-18 16:35:06 +10:00
Will Marshall
66d5f08b99 Adding custom filtering to home page 2014-04-18 15:17:12 +10:00
Will Marshall
6753b96f29 Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window 2014-04-18 13:01:36 +10:00
Will Marshall
c6395a686a Adding flash notifications 2014-04-17 15:08:01 +10:00
Rob H
1b5080ceb4 Remove render 2014-04-17 12:28:28 +10:00
Rob H
5345e8d339 Add accessible_by scope to enterprises model and accessible action to enterprises API 2014-04-17 12:23:09 +10:00
Rob H
20a5278a75 Merge branch 'master' into bom 2014-04-17 09:23:08 +10:00
Rob H
83e3172901 Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved 2014-04-16 18:27:50 +10:00
Will Marshall
171c8c6ed1 Merging in with master 2014-04-16 16:16:15 +10:00
Rob H
c68aeb4c36 Only show orders I am distributing in the API 2014-04-16 14:54:50 +10:00
Rob H
2b283405e7 Only admin and users of distributors can access admin orders 2014-04-13 10:09:17 +10:00
Rohan Mitchell
aa1c28b163 Move enterprises api controller out of spree namespace 2014-04-11 19:08:55 +10:00
Will Marshall
6e35dc7168 Merging with master 2014-04-11 13:09:22 +10:00
Rob H
e114aecfd0 Merge branch 'master' into bom 2014-04-10 16:30:13 +10:00
Will Marshall
36a4e34dff Preprocessing order attributes, returning path 2014-04-09 15:04:17 +10:00
Rohan Mitchell
19ca8e142a Do not show deleted products on shopfront 2014-04-09 15:02:40 +10:00
Will Marshall
b5550c048a Starting on JSON checkout, moving Order properties to Order.order 2014-04-09 14:33:45 +10:00
Will Marshall
8a45b6c012 Removing nothing special text and patching change password form slightly more 2014-04-08 18:07:55 +10:00
Will Marshall
4447730505 Removing nothing special text and patching change password form slightly more 2014-04-07 14:52:01 +10:00
Rob H
8e54bf1e2e Enterprise users are aurthorised to view BOM 2014-04-04 09:11:56 +11:00
Will Marshall
5d36dc5b4f Moving User Account to darkswarm 2014-03-28 16:02:32 +11:00
Will Marshall
12b1a1b0e9 Switching our recover password form to Darkswarm 2014-03-28 16:02:31 +11:00
Will Marshall
e48a25983a Starting a working forgot password system 2014-03-27 15:11:11 +11:00
Will Marshall
2be9ad7dd0 Starting with our own passwords controller 2014-03-27 13:52:02 +11:00
Will Marshall
40d1563cd9 Adding our own user registrations controller, reworking sidebar a touch 2014-03-21 15:18:27 +11:00
Will Marshall
74fb266748 Adding some requirement filters to the Orders controller 2014-03-21 15:18:27 +11:00
Rohan Mitchell
638e922ae2 Do not allow customer to purchase the obsolete master of a product 2014-03-20 10:56:46 +11:00
Will Marshall
51b6ac3e68 Fixing one regression bug 2014-03-18 17:03:09 +11:00
Will Marshall
49789c865e No longer copying old ship address from pickup, adding phone to custom shipping address 2014-03-18 16:47:28 +11:00
Will Marshall
0cc108206b Reworking the top details so it works in all pages 2014-03-14 17:06:03 +11:00
Will Marshall
a954f2c21a Basic Darkswarm version of the Order Confirmation page 2014-03-14 16:11:40 +11:00
Will Marshall
dc95d764fe Fixing some edge cases in the addresses 2014-03-14 11:56:25 +11:00
Will Marshall
3370865a01 Adding group siblings to the shop page 2014-03-13 14:50:06 +11:00
Will Marshall
9c655a855e Redirecting to the shop page when a distributor is selected 2014-03-13 11:47:55 +11:00