Commit Graph

7324 Commits

Author SHA1 Message Date
Rob Harrington
7ffe0f042e Moving accessible_by scope on Enterprise to permissions 2015-05-07 12:50:55 +10:00
Rob Harrington
f79fba52be Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle 2015-05-07 12:50:55 +10:00
Rob Harrington
4259b466f5 Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports 2015-05-07 12:50:55 +10:00
Rob Harrington
28bf7037db Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports 2015-05-07 12:50:55 +10:00
Rob Harrington
ed9bbe2c45 Sorting Hub and Producer filter selectors by name 2015-05-07 12:50:55 +10:00
Rob Harrington
b5c7607d67 Order cycle filter resets date filters on BOM 2015-05-07 12:50:55 +10:00
Rob Harrington
e640376d63 Don't load cancelled orders into bulk order management 2015-05-07 12:50:54 +10:00
Rob Harrington
9ab16d8cec Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer' 2015-05-07 12:50:54 +10:00
Rob Harrington
d8c23d37ac Update accessible_by scope on enterprise, to read from permissions 2015-05-07 12:50:54 +10:00
Rob Harrington
89b153dc2c Update AJAX request to use sells instead of deprecated is_distributor attribute 2015-05-07 12:50:54 +10:00
Rohan Mitchell
d9404d3332 Merge branch 'master' into single-order-patches 2015-05-06 17:29:23 +10:00
Rohan Mitchell
f024f62970 Content-manage footer fields 2015-05-06 16:36:10 +10:00
Rohan Mitchell
bf435a8f3d Make home page what's happening text and about URL configurable 2015-05-06 15:17:28 +10:00
Rohan Mitchell
01d1e84f85 Update global links 2015-05-06 15:15:09 +10:00
Rohan Mitchell
e43d726b97 Merge branch 'master' into payments-report-fix 2015-05-06 14:55:10 +10:00
Rohan Mitchell
b5a6f9c1bc Add infrastructure so admin can configure content. Make homepage tagline CTA configurable. 2015-05-06 14:54:16 +10:00
Rohan Mitchell
1ffba674b3 Show real stats on home page 2015-05-06 14:54:16 +10:00
Rohan Mitchell
e662aab004 Brand story can be expanded and contracted 2015-05-06 14:54:16 +10:00
Rohan Mitchell
abee9c8198 Update security text and licensing 2015-05-06 14:54:15 +10:00
summerscope
3bca1f2070 Tweaks to homepage styling 2015-05-06 11:32:47 +10:00
Rob Harrington
8788322492 Alllowing payments in payment reports to access soft-deleted payment methods 2015-05-06 11:10:50 +10:00
summerscope
808979a8e0 Add a to do note for Rohan in css 2015-05-06 09:44:45 +10:00
summerscope
b0f76330b7 Changing order of events on homepage to make shopping the most obvious thing on homepage. 2015-05-06 09:38:49 +10:00
summerscope
216f99d1c7 New link for footer - updated URL 2015-05-05 16:14:18 +10:00
summerscope
31c4af154e Applying Jay's copy to homepage 2015-05-05 15:44:36 +10:00
summerscope
e7d09f1b55 Change copy as supplied by Jay 2015-05-05 15:32:04 +10:00
summerscope
62a39af975 Make assets for home even smaller 2015-05-05 15:11:52 +10:00
summerscope
c0b12e39a8 Tweaking styling on shopfront header 2015-05-05 14:59:37 +10:00
summerscope
75055300e3 Adding comments into Footer for CMS implementation stuff with Rohan 2015-05-05 14:56:11 +10:00
summerscope
af4fe27f31 Adding comments for CMS implementation stuff with Rohan 2015-05-05 14:53:25 +10:00
summerscope
faa490b093 Reslice to optimise for web & reduce file size 2015-05-05 14:53:07 +10:00
summerscope
4da6bef639 Removing unused assets. Adding some todo notes. Optimising PNG assets to reduce file size. 2015-05-05 13:35:51 +10:00
Rohan Mitchell
63ec0d7dcf Merge branch 'master' into folklabs-producer-emails 2015-05-05 11:48:31 +10:00
summerscope
ae221f0416 Remove clashing padding classes 2015-05-04 23:02:33 +10:00
summerscope
924efec49c Add animation class to make consistent with Hubs and Producers.
Remove class .animate-repeat
2015-05-04 22:59:48 +10:00
summerscope
9082da6d5e Remove animation from search field, add to group nodes 2015-05-04 22:57:07 +10:00
summerscope
eabe0e43e2 Fix the big input styling to work better with new typography 2015-05-04 22:55:57 +10:00
summerscope
91afbaca4b Fixing name-space clash in footer 2015-05-04 22:49:10 +10:00
summerscope
2736421460 First cut at Groups landing page for sign up. 2015-05-04 22:42:14 +10:00
summerscope
84c2faddd5 Adding new link to footer 2015-05-04 22:19:33 +10:00
summerscope
0510fa27e6 More design tweaks for homepage and conversion pages 2015-05-04 18:23:04 +10:00
summerscope
b483afe7f7 Styling Producers page - simpler and to be more in-line with Shops page 2015-05-04 14:36:12 +10:00
summerscope
41fb44c19b More styling on pricing table
Remove middle column
2015-05-04 14:33:03 +10:00
summerscope
938358007a > More styling for landing pages for signup
> Add signup page for groups / food systems partners
> Change link in footer
2015-05-04 13:44:35 +10:00
summerscope
503c483acd Tweak language 2015-05-04 13:16:18 +10:00
summerscope
3091b365ec Adding in logos for case studies
More styling on signup pages
2015-05-04 13:15:18 +10:00
Rick Giner
368402f115 Changed selectors' ng-repeat. Using existing variable instead of method call 2015-05-03 15:24:16 +10:00
Rick Giner
9e70c80d1d bind-once in product modal 2015-05-03 14:48:27 +10:00
Rick Giner
8fb11defdb bind-once in groups home page 2015-05-03 14:41:34 +10:00
Rick Giner
9c26b3ebb2 bind-once in partials 2015-05-03 14:34:42 +10:00