Rob H
|
eb7d69fe6b
|
commit routes.rb file to prevent overwriting
|
2012-10-22 11:35:48 +11:00 |
|
Rob H
|
4c0109bccc
|
Merge branch 'master', remote-tracking branch 'origin'
|
2012-10-22 11:15:23 +11:00 |
|
Rob H
|
f83a5b0ba8
|
Merge branch 'master', remote-tracking branch 'origin'
|
2012-10-22 10:45:35 +11:00 |
|
Rohan Mitchell
|
87a89324d9
|
Update repo in readme, add Rob to creds
|
2012-10-19 17:02:09 +11:00 |
|
Rohan Mitchell
|
4fc7295b97
|
Use S3 configuration from environment vars instead of s3.yml
|
2012-10-19 16:40:18 +11:00 |
|
Rohan Mitchell
|
5b025a6cba
|
Make group_buy_unit_size accessible
|
2012-10-18 15:15:54 +11:00 |
|
Rohan Mitchell
|
9166829930
|
Add group buy unit size field
|
2012-10-18 11:56:21 +11:00 |
|
Rohan Mitchell
|
8c7a02ec10
|
Fix image uploads with CMS
|
2012-10-18 11:13:40 +11:00 |
|
Rohan Mitchell
|
f4f250675c
|
Use eaterprises spree_paypal_express with Bugsnag notification of paypal gateway errors
0.2.5
|
2012-10-18 10:30:35 +11:00 |
|
Rohan Mitchell
|
394a269df2
|
Update Spree, fixes paypal password blanking bug. Update spree_paypal_express, fixes nil state error on checkout.
|
2012-10-18 10:17:52 +11:00 |
|
Rohan Mitchell
|
41dcc85ad1
|
Update version of spree_paypal_express for debugging
|
2012-10-17 15:26:06 +11:00 |
|
Rohan Mitchell
|
9be9d75cb5
|
Update version of spree_paypal_express for debugging
|
2012-10-17 15:10:04 +11:00 |
|
Rohan Mitchell
|
11483a77e8
|
Update bugsnag and spree_paypal_express for paypal error debugging
0.2.4
|
2012-10-17 08:42:33 +11:00 |
|
Rohan Mitchell
|
ba895ed486
|
Display CMS content for suppliers page
|
2012-10-17 07:54:12 +11:00 |
|
Rohan Mitchell
|
36d342f216
|
Add view all suppliers page
|
2012-10-17 07:50:58 +11:00 |
|
Rohan Mitchell
|
d09123eb22
|
Do not show suppliers with no products in stock
|
2012-10-17 07:36:18 +11:00 |
|
Rohan Mitchell
|
642f58551c
|
Use spree_paypal_express from RohanM with debugging for nil state from paypal address error
0.2.3
|
2012-10-16 10:34:11 +11:00 |
|
Rohan Mitchell
|
9fbcd8c01b
|
Display CMS pages with Spree's layout
0.2.2
|
2012-10-12 10:21:21 +11:00 |
|
Rohan Mitchell
|
927970d1a9
|
Viewing another products listing page does not display home page content
0.2.1
|
2012-10-12 09:39:49 +11:00 |
|
Rohan Mitchell
|
3dd3d8030f
|
Display CMS pages in menu
|
2012-10-11 17:00:34 +11:00 |
|
Rohan Mitchell
|
cab61ddb7c
|
CMS content on home page
|
2012-10-11 16:21:33 +11:00 |
|
Rohan Mitchell
|
015b7f88b0
|
Add tests for CMS admin security
|
2012-10-11 13:17:05 +11:00 |
|
Rohan Mitchell
|
28fc16ac66
|
Create links between Spree and CMS admin sections
|
2012-10-11 12:50:59 +11:00 |
|
Rohan Mitchell
|
e1d4ee318c
|
Fix issues with elRTE - sprites and functionality now work for link and image functions
|
2012-10-11 12:00:30 +11:00 |
|
Rohan Mitchell
|
48497266da
|
Precompile CMS assets
|
2012-10-11 11:06:52 +11:00 |
|
Rohan Mitchell
|
fe5fd76415
|
Further syntax fixes for GroupBuyReport
|
2012-10-11 10:53:33 +11:00 |
|
Rohan Mitchell
|
c05911fa10
|
Fix spree_creditcards table renamed in Spree 1.2 upgrade, remove old pending test
|
2012-10-11 10:50:37 +11:00 |
|
Rohan Mitchell
|
a686a820d9
|
Add distributor show page, redirect here after selecting distributor
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
3889545f2b
|
Convert suppliers page to HAML
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
7432cb416e
|
Andand all the html_safes
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
0b830a7845
|
Suppliers and distributors long description editable with WYSIWYG editor from CMS and displayed as HTML
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
58e5724f81
|
Display supplier details on supplier page
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
c07a33d88c
|
Edit long description field in admin for suppliers and distributors
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
d080aa49d5
|
Add long description field to distributors and suppliers
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
a31c5bbe46
|
Authorise CMS via Spree login
|
2012-10-11 10:50:36 +11:00 |
|
Rohan Mitchell
|
b35fb618f3
|
Add base install of Comfortable Mexican Sofa
|
2012-10-11 10:50:36 +11:00 |
|
Rob H
|
8c7ed6f4ef
|
Merge branch 'group-buy-report'
|
2012-10-10 15:47:02 +11:00 |
|
Rob H
|
1709083d8f
|
Merge branch 'master' of github.com:andrewspinks/openfoodweb
|
2012-10-10 15:45:42 +11:00 |
|
Rob H
|
5803da9c55
|
Syntax fixes for group buy report classes and tests
|
2012-10-10 15:13:15 +11:00 |
|
Rohan Mitchell
|
0ad6045363
|
Fix struct superclass mismatch error
|
2012-10-10 14:02:44 +11:00 |
|
Rob H
|
9737f21bb8
|
WIP: Write body of group buy report
|
2012-10-10 13:46:51 +11:00 |
|
Rohan Mitchell
|
2535e3965b
|
When merging orders, set distributor when target order distributor is nil
0.2.0
|
2012-10-09 08:42:29 +11:00 |
|
Rohan Mitchell
|
568d948cbe
|
Destroy incomplete orders if they can't be merged, prevents that order unexpectedly appearing in cart after checkout. Also ensure all orders have a shipping method.
|
2012-10-05 12:09:53 +10:00 |
|
Rob H
|
d7a5a87aef
|
create group buy report, display header
|
2012-10-03 11:49:21 +10:00 |
|
Rob H
|
3b8c41840f
|
Merge branch 'master' of github.com:andrewspinks/openfoodweb
Conflicts:
app/models/spree/line_item_decorator.rb
db/migrate/20120919013335_add_shipping_method_to_line_items.rb
|
2012-10-03 10:27:19 +10:00 |
|
Rohan Mitchell
|
6d9257d941
|
Do not delete shipping method referenced by a line item
|
2012-10-02 12:15:09 +10:00 |
|
Rohan Mitchell
|
7430fc9bdd
|
Do not delete shipping method referenced by a product distribution
|
2012-10-02 11:58:18 +10:00 |
|
Rohan Mitchell
|
473b4e9adc
|
Add positive case test
|
2012-10-02 11:54:18 +10:00 |
|
Rohan Mitchell
|
2aa450b072
|
Do not delete shipping method referenced by an order
|
2012-10-02 11:51:13 +10:00 |
|
Rohan Mitchell
|
3886ec39f7
|
Add web helper method to visit paths with delete method
|
2012-10-02 11:47:55 +10:00 |
|