Rohan Mitchell
|
0b0c8253c1
|
Provide a hardcoded country code for CI (Jenkins), where countries are not pre-loaded
|
2013-10-11 14:13:24 +11:00 |
|
Rohan Mitchell
|
ba31e5d9fb
|
Remove hardcoded ID for Australia
|
2013-10-11 12:52:49 +11:00 |
|
Rohan Mitchell
|
30bc45370b
|
When order cycle expires mid-order, clear the order cycle and display a message
|
2013-09-30 16:56:11 +10:00 |
|
Rohan Mitchell
|
54d95d304f
|
Convert to Melbourne time zone
|
2013-09-30 11:25:26 +10:00 |
|
Rohan Mitchell
|
99e12afd04
|
Explicitly compile store/shop_front.js, which is used on the temp landing page in isolation from all.js
|
2013-09-23 16:47:03 +10:00 |
|
Rohan Mitchell
|
136ec7d9d3
|
Remove heroku newrelic config
|
2013-09-19 09:34:57 +10:00 |
|
Rohan Mitchell
|
633399bbfb
|
Rename 'Inner Melbourne' region to 'Eaterprises'
|
2013-09-18 12:39:20 +10:00 |
|
David Cook
|
fe513d42c4
|
Rename 'Order Cycles' report group to 'Orders & Fulfillment'
|
2013-09-18 09:25:51 +10:00 |
|
Rohan Mitchell
|
29e1f38207
|
Set up production distributors for current order cycle
|
2013-09-12 18:21:44 +10:00 |
|
David Cook
|
b7541dcd52
|
Rename 'Home' link to 'OFN'
|
2013-09-11 15:13:45 +10:00 |
|
Rohan Mitchell
|
8f768d3b84
|
Update staging distributors
|
2013-09-10 15:17:18 +10:00 |
|
Rohan Mitchell
|
91550ac82f
|
Move distributor config to its own file, re-enable pry for tests
|
2013-09-10 09:50:16 +10:00 |
|
Rohan Mitchell
|
15d3bff92d
|
Add delete_content_for helper, can be used for removing the sidebar from spree views
|
2013-09-10 08:45:59 +10:00 |
|
alexs333
|
999bc2697a
|
Implemented simlified shop flow.
|
2013-09-04 20:33:18 +10:00 |
|
Rohan Mitchell
|
8a092697ee
|
Enterprise manager can clone an order cycle
|
2013-08-22 17:11:53 +10:00 |
|
Rohan Mitchell
|
f1fa90d7c3
|
Clone order cycles
|
2013-08-22 16:53:11 +10:00 |
|
Rohan Mitchell
|
aab7176f2c
|
Enterprise manager can bulk edit products
|
2013-08-22 11:21:49 +10:00 |
|
alexs
|
acfb1bd600
|
Making sure that only distributor enterprises are displayed on the landing page.
|
2013-08-21 12:03:44 +10:00 |
|
alexs
|
fdf80cac5e
|
Adjusted specs to accommodate for new (temporary) landing page.
|
2013-08-20 16:14:29 +10:00 |
|
alexs
|
8f67f385b7
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-19 17:37:49 +10:00 |
|
alexs
|
f160e051e5
|
Added new temporary landing page.
|
2013-08-19 17:37:22 +10:00 |
|
Andrew Spinks
|
a8d4efd067
|
Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor.
|
2013-08-16 17:08:19 +10:00 |
|
alexs
|
82df7cddeb
|
Added staging environment.
|
2013-08-15 17:43:21 +10:00 |
|
Andrew Spinks
|
fdaa5364a1
|
Add controller action for adding products to multi cart via javascript API.
|
2013-08-15 15:36:35 +10:00 |
|
alexs
|
bdc8387346
|
Added base for shop front (enterprise).
|
2013-08-14 17:31:25 +10:00 |
|
alexs
|
e90ccef337
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-13 11:40:54 +10:00 |
|
alexs
|
215d6030d7
|
Added link to 'About OFN' page (as well as the base for that page).
|
2013-08-13 11:36:24 +10:00 |
|
Rohan Mitchell
|
5f4313b588
|
Remove itemwise shipping calculator
|
2013-08-13 10:14:39 +10:00 |
|
alexs
|
94cab872a5
|
Temporarily removing ssl enforcing.
|
2013-08-11 17:53:53 +10:00 |
|
alexs
|
71262d3cb3
|
Base for enterprise search via suburb selector..
|
2013-08-11 16:57:00 +10:00 |
|
alexs
|
834cec48bf
|
Forcing site-wide SSL for production and staging environments.
|
2013-08-09 13:28:58 +10:00 |
|
Andrew Spinks
|
bc57364c7e
|
Add simple angular cart to the main page.
|
2013-08-08 18:31:56 +10:00 |
|
alexs
|
f45ed42bdb
|
Skeleton for the search results.
|
2013-08-08 11:42:45 +10:00 |
|
alexs
|
44e06fe7fc
|
Added search stuff to the least of assets to precompile.
|
2013-08-08 10:43:21 +10:00 |
|
alexs
|
24d559cd3a
|
Merge branch 'master' into landing_page
Conflicts:
db/schema.rb
db/seeds.rb
|
2013-08-05 17:08:39 +10:00 |
|
alexs
|
38b0a581e0
|
New landing page - initial layout and functionality
|
2013-08-05 17:04:56 +10:00 |
|
Andrew Spinks
|
b0d9596489
|
Fix bug with available on translation - seemed to be getting overridden.
|
2013-08-05 10:00:47 +10:00 |
|
Rohan Mitchell
|
fe61cddda6
|
Merge branch 'local-organics'
Conflicts:
Gemfile
Gemfile.lock
app/assets/stylesheets/store/variables.css.scss
app/overrides/add_feedback_script.rb
app/views/spree/shared/_order_details_steps_data.html.erb
db/schema.rb
script/rails
spec/spec_helper.rb
|
2013-07-23 11:40:03 +10:00 |
|
Rob H
|
3c973178fd
|
WIP: remove unneeded representative-based data request infrastructure
|
2013-07-23 10:43:08 +10:00 |
|
Rob H
|
9863a84a27
|
WIP: transfer bulk product update data requests to API
|
2013-07-23 10:43:08 +10:00 |
|
Rob H
|
97c03b50cc
|
Create new api routes/views/controllers for bulk product edit
|
2013-07-23 10:43:08 +10:00 |
|
Rob H
|
703f51ac1b
|
WIP (Spree Update): Update reference to current_user -> spree_current_user
|
2013-07-23 10:43:08 +10:00 |
|
Rob H
|
4ae5085192
|
BPUR: Remove unnecessary collections of products on bulk edit page
|
2013-07-23 10:37:50 +10:00 |
|
Rob H
|
1e64dab9f7
|
Bulk product update rewrite: basic integration test passing
|
2013-07-23 10:37:50 +10:00 |
|
Rob H
|
731127d55c
|
WIP: Bulk Product Update Rewrite: initial acceptance testing
|
2013-07-23 10:37:50 +10:00 |
|
Rohan Mitchell
|
efec0b07d6
|
Merge branch 'amazon-ec2'
Conflicts:
Gemfile
Gemfile.lock
|
2013-07-22 10:29:11 +10:00 |
|
Rohan Mitchell
|
5683656605
|
Merge branch 'invalid-login-message'
|
2013-07-12 13:07:30 +10:00 |
|
David Cook
|
98be44b301
|
Disable asset debug logging
|
2013-06-20 11:50:34 +10:00 |
|
David Cook
|
4e2549d347
|
Add host setting, required for authenticating local DBs
|
2013-06-20 11:49:36 +10:00 |
|
David Cook
|
1a06b53b21
|
More verbose sign in error message
|
2013-06-13 16:29:45 +10:00 |
|