Rohan Mitchell
387021929e
Merge branch 'master' into rob-github-fixes
2015-06-16 15:05:01 +10:00
Rob Harrington
30af5d4278
Enterprise relatives include self where appropriate for serialized injection data
2015-06-15 19:45:29 +08:00
Rob Harrington
92082ce95c
Adding filter back on producers page
2015-06-15 16:35:41 +08:00
Rob Harrington
1558ddb1eb
Fixing index enterprise serializer so that payment methods issue displays when no payment methods are present
2015-06-15 16:15:06 +08:00
Rob Harrington
0038ebaa1f
Fix styling issue for full sixteen column enterprise index panel
2015-06-15 16:10:33 +08:00
Rob Harrington
943c702e88
Hiding 'more' list if there are no overflow filter selectors
2015-06-15 15:54:55 +08:00
Rob Harrington
fb19feb357
Adding filters back to the hub page
2015-06-15 15:43:43 +08:00
Rob Harrington
e09431fa20
Styling tweaks
2015-06-15 15:43:19 +08:00
Rob Harrington
fb11c93943
Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive
2015-06-15 15:43:01 +08:00
Rob Harrington
727e8a81d6
Making sure enterprise serializer serializes no taxons as an empty array
2015-06-15 15:41:25 +08:00
Rob Harrington
0e96a23a52
Fixing filters selector directive to that an allSelector watcher isn't required for generation on selectors to work
2015-06-15 12:06:23 +08:00
Maikel Linke
80bf6e61ad
redirect /t/products/:id to /
2015-06-13 11:59:52 +10:00
Maikel Linke
c6d01055d6
updating relationship spec
2015-06-12 19:32:56 +10:00
Rob Harrington
82d31b908f
More styling tweaks
2015-06-12 16:09:53 +08:00
Rob Harrington
066c8876ff
Only serializing unresolved enterprise issues, styling tweaks and fixes for index
2015-06-12 15:49:01 +08:00
Maikel Linke
de1971072e
update relationship js spec
2015-06-12 17:09:04 +10:00
Maikel Linke
f44ac5b27b
Merge branch 'url-redirects' into e2e-links
2015-06-12 17:03:31 +10:00
Maikel Linke
d717c38f6d
Filter relationships by permission
2015-06-12 17:03:17 +10:00
Maikel Linke
61effc03c1
add "Enterprise Relationships" tab for non-admins
2015-06-12 17:03:17 +10:00
Maikel Linke
f2bc98e812
E2E: select all permissions
2015-06-12 17:03:17 +10:00
Rob Harrington
795b2700b4
Merge branch 'master' into enterprise-index-revamp
2015-06-12 12:47:58 +08:00
Rob Harrington
6ab5efbe02
Last minute styling adjustments
2015-06-12 12:40:24 +08:00
Rob Harrington
59d5ebe9d4
Changes to copy
2015-06-12 12:32:17 +08:00
Rob Harrington
1fb1733644
Adding link to user guide to enterprises index and dashboard
2015-06-12 12:31:57 +08:00
Rob Harrington
775718c776
Adding status panel on enterprise index
2015-06-12 12:09:00 +08:00
Rohan Mitchell
2b763271a7
Merge branch 'master' into optimise-shopfront
2015-06-12 12:15:20 +10:00
Maikel Linke
d61073f08d
redirect /enterprises to /
2015-06-12 10:47:50 +10:00
Maikel Linke
2fb8f9f8a3
Redirect /products to /
...
GitHub issue #571
2015-06-12 10:47:50 +10:00
Rohan Mitchell
4f311543ae
Merge branch 'master' into enterprise-index-revamp
2015-06-12 10:26:11 +10:00
Rob Harrington
eed27ceb31
Shipping Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:50 +08:00
Rob Harrington
77432ffc41
Payment Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:37 +08:00
Rob Harrington
5d2b36c667
Enterprise Fee feature specs work with new enteprise user enterprise index
2015-06-12 03:10:14 +08:00
Rob Harrington
61beb38e9c
Bringing back delayed_job on enterprise emails - acctidentally took it out earlier
2015-06-12 03:09:40 +08:00
Rob Harrington
efca4dde10
Fixing enterprises feature spec
2015-06-12 01:49:39 +08:00
Rob Harrington
d0b7550629
Removing screenshot from spec
2015-06-12 01:49:39 +08:00
Rob Harrington
6f975593fe
Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users
2015-06-12 01:49:39 +08:00
Rob Harrington
64ed80f845
Enterprise index action load enterprise_set for super admin
2015-06-12 01:49:39 +08:00
Rob Harrington
f80a5fe558
Fixing reference to change_type_form partial from single enterprise dashboard
2015-06-12 01:49:38 +08:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rob Harrington
1cd6866879
Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job
2015-06-12 01:49:37 +08:00
Rob Harrington
1c1f82f4ee
Using events to update index row text on save, adding alert icons for enterprises without producer or package selected
2015-06-12 01:49:37 +08:00
Rob Harrington
95073f6fe7
Adding actual link to the manage link on enterprises index
2015-06-12 01:49:37 +08:00
Rob Harrington
e575b0e490
Switching enterprise index to its own dedicated serializer, so we can spit out ownership
2015-06-12 01:49:37 +08:00
Rob Harrington
5a08344812
Changing 'shop' column and panel to 'package'
2015-06-12 01:49:37 +08:00
Rob Harrington
e3d7c00c8e
Removing option of 'producer profile only' from enterprise shop panel
2015-06-12 01:49:36 +08:00
Rob Harrington
8aa55088ab
Adding a parent directive to coorindate styling of panel tabs
2015-06-12 01:49:36 +08:00
Rob Harrington
a90cd0f8e0
Owners can update sells on enterprises they own
2015-06-12 01:49:36 +08:00
Rob Harrington
6b35e993bd
WIP: More work on panel content, styling and data submission logic
2015-06-12 01:49:36 +08:00
Rob Harrington
a586a52c23
Shortcutting around existing Enterprise service, so that we can use it for something more useful
2015-06-12 01:49:36 +08:00
Rob Harrington
b84f5a26a1
WIP: Splitting type panel into separate producer and shop panels, playing with styling
2015-06-12 01:49:35 +08:00
Rob Harrington
451ba1c01b
panel rows adjust to span the number of visible columns
2015-06-12 01:49:35 +08:00
Rob Harrington
c441c8c6cb
Columns service holds a column count and notifies rootscope when it changes
2015-06-12 01:49:35 +08:00
Rob Harrington
0c36738472
Adding basic generalised panel row infrastructure to indexUtils
2015-06-12 01:49:35 +08:00
Rob Harrington
ff3d9e27ec
Upgrade angular-rails-templates
2015-06-12 01:49:35 +08:00
Rob Harrington
d5f9b40707
WIP: Basic version of revamped enterprise index
2015-06-12 01:49:34 +08:00
Rob Harrington
02d3d34826
Adding basic angular infrastructure for enterprises
2015-06-12 01:49:34 +08:00
Rob Harrington
5215623864
Adding bindonce to admin
2015-06-12 01:49:34 +08:00
Rob Harrington
ed7a53968c
Using clearer json_request? method for customers controller
2015-06-12 01:49:34 +08:00
Rob Harrington
c311bcdca7
Overriding enterprises index action to use AMS for json requests, and prevent collection loading for html requests
2015-06-12 01:49:33 +08:00
Rohan Mitchell
ecbf3c8fa7
Ensure we start with consistent config settings
2015-06-11 16:16:36 +10:00
Rohan Mitchell
bfeb63c8d7
Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec
2015-06-11 14:16:18 +10:00
Rohan Mitchell
6dea3fa19d
Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:32 +10:00
Rohan Mitchell
075e9edbf6
Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:27 +10:00
Maikel Linke
a8b6f2942a
Releasing Assets Version 1.1
...
The uglifier update affects only re-compiled assets. In order to replace
the broken assets (e.g. #396 ) with re-compiled assets, we change the
assets version number.
2015-06-11 10:54:30 +10:00
Rohan Mitchell
604360034b
Make filter method private
2015-06-10 17:04:09 +10:00
Rohan Mitchell
a0fd91dc57
Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting.
2015-06-10 17:03:56 +10:00
Rohan Mitchell
d79129880e
Put lock around adjustment clear/re-create to avoid race condition resulting in duplicate fees
2015-06-10 17:02:30 +10:00
Rohan Mitchell
7412e92665
Merge branch 'master' into optimise-shopfront
2015-06-10 16:39:02 +10:00
Rohan Mitchell
ee01113fe1
Fix duplicate factory value spec error
2015-06-10 15:31:53 +10:00
Maikel Linke
5a7231579c
update uglifier to 2.7.1
2015-06-10 13:58:52 +10:00
Maikel Linke
3c38c8e504
Merge branch 'adjustment-metadata-deletion' into combined/session-store_adjustment-metadata_uglifier
...
Conflicts:
db/schema.rb
2015-06-10 13:56:36 +10:00
Maikel Linke
6c0238deac
scoping down large request spec
2015-06-10 13:50:55 +10:00
Maikel Linke
f88f42283a
Session stored in ActiveRecored instead of Cookies
...
The cookie store is not big enough in some cases. In order to solve a
CookieOverflow error and maybe track down the underlying issue this
patch uses the database instead of cookies to store session data.
2015-06-10 13:49:24 +10:00
Maikel Linke
88872b4b49
add spec_helper to customers_controller_spec
2015-06-06 11:49:49 +10:00
Maikel Linke
153360d17b
Let the database delete adjustment metadata
...
GitHub issue #582
We encountered a foreign key violation on adjustment metadata even
though rails should handle that.
Action: order.adjustments.where(originator_type: 'EnterpriseFee').destroy_all
Adjustment: has_one :metadata, class_name: 'AdjustmentMetadata' dependent: :destroy
So we update the foreign key to cause a delete in the database.
2015-06-05 16:10:58 +10:00
Rohan Mitchell
80834a0c27
Merge branch 'master' into ginerr_bugfixes
2015-06-05 15:49:43 +10:00
Maikel Linke
d6c630dad9
add spec_helper to customers_controller_spec
2015-06-05 14:25:45 +10:00
Maikel Linke
7461009c3b
Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:58 +10:00
Maikel Linke
252e9be016
Merge branch 'remove-old-bugsnag-notification' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:03 +10:00
Maikel Linke
f324471495
Merge branch 'index_enterprise_permalink' into combined/xero-report_analytics-bugfixes
2015-06-05 14:20:13 +10:00
Maikel Linke
f438a44f26
Merge remote-tracking branch 'origin/analytics' into combined/xero-report_analytics-bugfixes
...
Conflicts:
app/controllers/spree/admin/orders_controller_decorator.rb
2015-06-05 14:19:54 +10:00
Maikel Linke
1b91082c1c
Merge branch 'show-order-without-current-distributor' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:47 +10:00
Maikel Linke
ffa960b02e
Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:24 +10:00
Maikel Linke
41dafce0db
Remove obsolete Bugsnag notification
2015-06-05 13:46:15 +10:00
Maikel Linke
e35b39c7cf
Handle invalid referer URLs
...
Rescues URI::InvalidURIError of URL(request.referer).
2015-06-05 12:43:49 +10:00
Maikel Linke
552bbf221c
Delete obsolete paragraph in registration #595
2015-06-05 11:01:40 +10:00
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
fc7e33d706
Fall back on individual calculations when pre-prepared values are not present
2015-06-04 16:43:19 +10:00
Rohan Mitchell
ef3155a16a
Pull product listing fee calculations out of serializer loop
2015-06-04 16:27:32 +10:00
Rohan Mitchell
3846d16822
Add methods to load fees for a number of variants in one go
2015-06-04 16:22:06 +10:00
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +10:00
Rohan Mitchell
486c2f9b42
WIP: Skip EnterpriseFeeApplicator step when computing fees
2015-06-04 12:13:04 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +10:00
Rohan Mitchell
cf0031d9a5
WIP: Optimise enterprise fee calculation
2015-06-04 11:53:09 +10:00
Rohan Mitchell
85d1d67dac
Sort orders as required by spec, fixes intermittent fail
2015-06-04 09:43:36 +10:00
Continuous Integration
a1425c5e07
Auto-merge from CI [skip ci]
2015-06-04 07:22:43 +10:00
Maikel Linke
5d77a48ef3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into show-order-without-current-distributor
2015-06-03 20:36:12 +10:00
Rob Harrington
e93736b123
Ordering managed orders by id to fix spec
2015-06-03 18:16:07 +08:00
Maikel Linke
aea6277b77
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into index_enterprise_permalink
2015-06-03 19:54:29 +10:00
Rob Harrington
3855ae1337
Fixing bug on OC interface that prevented hubs from pulling their own products through
2015-06-03 16:18:44 +08:00
Rob Harrington
359328a96e
Producers and distributors lists include self where appropriate
2015-06-03 16:18:44 +08:00
Rob Harrington
dbd81e60a1
Fixing customer index feature spec, only checking shop when something has been selected
2015-06-03 16:18:09 +08:00
Rob Harrington
7c9b4dbc3e
Resolving unmerged section in bulk order management template
2015-06-03 15:33:04 +08:00
Rob Harrington
09160c8ea6
Fixing customers controller spec
2015-06-03 15:23:55 +08:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Rohan Mitchell
f1019e9221
Upgrade unicorn
2015-06-03 16:53:46 +10:00
Rohan Mitchell
2c0da5e350
Output parallel spec runtime log -> evenly split spec grouping
2015-06-03 16:38:47 +10:00
Maikel Linke
d2a61dc096
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 16:37:25 +10:00
Rohan Mitchell
0569ef0505
Only record analytics in production. Also record them in admin backend.
2015-06-03 16:36:31 +10:00
Rohan Mitchell
17d123db63
ng-cloak producers page
2015-06-03 16:28:43 +10:00
Rohan Mitchell
4d789b70ed
Merge branch 'products-and-inventory-report' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:12:29 +10:00
Maikel Linke
7302963605
inventory report: filter was broken because filter_to_order_cycle returned nil
...
[skip ci]
2015-06-03 15:11:32 +10:00
Rohan Mitchell
ad4e17b77a
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:10:12 +10:00
Rohan Mitchell
cd8084ae3f
Merge branch 'master' into parallel-tests
...
Conflicts:
script/ci/run_tests.sh
2015-06-03 15:08:15 +10:00
Rohan Mitchell
41b348f594
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:05:51 +10:00
Rohan Mitchell
2b3689fd93
Run CI specs in parallel
2015-06-03 14:29:38 +10:00
Rohan Mitchell
db47c01784
Initial config for parallel spec running
2015-06-03 14:29:38 +10:00
Rohan Mitchell
769a04d2e0
Merge branch 'master' into optimise-shopfront
2015-06-03 13:02:58 +10:00
Rohan Mitchell
36dc0d5ccd
Do not run performance specs in CI
2015-06-03 13:00:07 +10:00
Rohan Mitchell
b3878b126b
Decouple generic injection spec from EnterpriseSerializer
2015-06-03 12:53:46 +10:00
Rohan Mitchell
c6f6c11a43
Add wait between clicks to fix race condition
2015-06-03 12:51:15 +10:00
Rohan Mitchell
473322c7e6
CI: Add more robust merge-to-master script
2015-06-03 12:25:28 +10:00
Rohan Mitchell
8afffdae9a
Fix error when product does not have a master variant
2015-06-03 12:13:42 +10:00
Maikel Linke
4b6222bbe2
Updating spec using new button label
2015-06-03 12:08:47 +10:00
Maikel Linke
96177b7cd7
Add unique index to enterprise permalink
2015-06-03 11:57:22 +10:00
Maikel Linke
cb2adea59f
Remove executable bit from a migration file
2015-06-03 10:16:29 +10:00
Rohan Mitchell
22230294ab
Merge branch 'master' into optimise-shopfront
2015-06-03 10:07:42 +10:00
Maikel Linke
2853885f26
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 09:47:37 +10:00
Rohan Mitchell
a22da1ae51
Merge branch 'ng-cloak' into combined/bulk-product-edit-and-ng-cloak
2015-05-29 16:54:01 +10:00
Maikel Linke
159b33e2db
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-29 16:52:18 +10:00
Maikel Linke
0d3cdb9c69
Expand All button to show all variants in BPE
2015-05-29 16:51:55 +10:00
Rohan Mitchell
5c3a59acab
ng-cloak order cycles selector, tabs and shopfront
2015-05-29 16:39:41 +10:00
Rohan Mitchell
50ae331d94
ng-cloak mobile menu
2015-05-29 16:03:16 +10:00
Maikel Linke
fe27b1d446
text changes to the registration wizard
2015-05-29 15:24:17 +10:00
Maikel Linke
bf935623dc
changing default mailer url in development from test.com to 0.0.0.0:3000
2015-05-29 15:24:17 +10:00
Maikel Linke
678b591c18
Explain how to disable delayed jobs to send emails again
2015-05-29 15:24:16 +10:00
Maikel Linke
503b687ed1
Display distributor banner only if current_distributor is present
2015-05-29 15:19:05 +10:00
Rohan Mitchell
952353da8c
Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2015-05-29 15:08:30 +10:00
Rohan Mitchell
e5b3736e86
Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit
2015-05-29 14:36:51 +10:00
Continuous Integration
c14de4e97f
Auto-merge from CI [skip ci]
2015-05-29 14:29:23 +10:00
Rohan Mitchell
d478cc1f69
Serialize taxons and relatives in expected format
2015-05-29 14:03:44 +10:00
Continuous Integration
dccc9fb479
Auto-merge from CI [skip ci]
2015-05-29 12:44:44 +10:00
Rohan Mitchell
3f4f8afacd
EnterpriseRelationship.relatives does not show duplicates
2015-05-29 12:19:38 +10:00
Rohan Mitchell
69c54e1d70
Only load activated relatives for EnterpriseInjectionData
2015-05-29 12:08:21 +10:00
Rohan Mitchell
cdbf02ca20
EnterpriseRelationship.relatives can find activated enterprises only
2015-05-29 12:07:43 +10:00
Rohan Mitchell
4ce9ea05f0
Merge branch 'master' into require_standard_variant
2015-05-29 10:12:14 +10:00
Rohan Mitchell
835b56b222
Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb
2015-05-29 09:44:57 +10:00
Rohan Mitchell
7486daa2a3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
spec/lib/open_food_network/permissions_spec.rb
spec/lib/open_food_network/products_and_inventory_report_spec.rb
spec/models/enterprise_spec.rb
2015-05-28 15:08:13 +10:00
Maikel Linke
bf9addfa42
Merge branch 'group-custom-url' into group-pages
2015-05-28 13:27:48 +10:00
Maikel Linke
ff2eed7760
Using permalink in URLs pointing to groups
2015-05-28 11:27:40 +10:00
Maikel Linke
e4f93863fd
Finding unique permalink before validation.
2015-05-28 11:27:40 +10:00
Maikel Linke
aef128f2c9
permalink editable
2015-05-28 11:27:40 +10:00
Maikel Linke
19448a182e
Add permalink field to enterprise groups
2015-05-28 11:27:39 +10:00
Continuous Integration
a01a53caea
Auto-merge from CI [skip ci]
2015-05-28 11:05:07 +10:00
Rohan Mitchell
7f43dbf9bb
Fix further intermittent failures in permissions spec
2015-05-28 10:58:12 +10:00
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +10:00
Rohan Mitchell
ccf1e2951c
Fix intermittent failure in permissions spec
2015-05-28 10:45:47 +10:00
Rohan Mitchell
3ab7df88e6
Allow serialization of nil enterprise
2015-05-27 16:32:15 +10:00
Rohan Mitchell
75f1f673ad
Update spec for EnterpriseSerializer
2015-05-27 16:26:31 +10:00
Rohan Mitchell
e74390a013
Remove controller specs for @active_distributors, now set via helper
2015-05-27 16:26:08 +10:00
Rohan Mitchell
41bc67e2d8
Add benchmark for product serialisation
2015-05-27 15:44:02 +10:00
Rohan Mitchell
e1b4c3b1e4
Add benchmarking test for inject_enterprises
2015-05-27 15:44:02 +10:00
Rohan Mitchell
31b726613d
Avoid loading enterprise injection data when it's not be needed due to caching
2015-05-27 15:44:01 +10:00
Rohan Mitchell
dd761719ee
Fix undefined Api::IdSerializer error
2015-05-27 15:44:01 +10:00
Rohan Mitchell
1a887df412
Pull taxon computation out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
2c92b5a751
Find all supplied and distributed taxons
2015-05-27 15:44:01 +10:00
Rohan Mitchell
3afd636577
Pull relatives computation out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
cf79b90044
Load relatives of all enterprises in one go
2015-05-27 15:44:01 +10:00
Rohan Mitchell
4a59c85b3e
Inject current hub from AMS rather than RABL
2015-05-27 15:44:01 +10:00
Rohan Mitchell
704955a185
Load active distributors where they're needed rather than in most controllers
2015-05-27 15:44:01 +10:00
Rohan Mitchell
ee8db23fd9
Pull shipping method service computations out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
f0e909c92b
Look up the shipping services (pickup, delivery) that different hubs provide
2015-05-27 15:44:01 +10:00
Rohan Mitchell
f940984ca3
Pull earliest closing time computations out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
769edbe9d5
Find the earliest closing times for each distributor in an active order cycle
2015-05-27 15:44:01 +10:00
Rohan Mitchell
c5f00d87bd
When loading products for shopfront, load all master variants in one go
2015-05-27 15:44:01 +10:00
Rohan Mitchell
99cb09c6f7
When loading products for shopfront, load all variants in one go
2015-05-27 15:44:01 +10:00
Continuous Integration
5377af9cf9
Auto-merge from CI [skip ci]
2015-05-24 09:52:53 +10:00
Rick Giner
a5482c269f
#541 Fixed issue of showing negative 'more' numbers, and only working for current Hub
2015-05-24 09:52:34 +10:00
Maikel Linke
5a43ed2046
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-22 18:17:20 +10:00
Maikel Linke
28dae3c6c6
Enterprises cannot add themselves to Groups
2015-05-22 15:23:59 +10:00
Rob Harrington
5d47dc2fdb
Sort array so that order doesn't cause spec fail
2015-05-22 15:03:21 +10:00
Rob Harrington
5b65f67737
Amending spec expect after_create when we want after_save
2015-05-22 15:02:49 +10:00
Rob Harrington
e931f4b31f
Merge branch 'master' into require_standard_variant
2015-05-22 12:22:54 +10:00
Rob Harrington
63f3ede766
Prepare master variants for duplication as standard variant by ensuring they have a unit value and that the product has a variant unit
2015-05-22 12:22:05 +10:00
Rob Harrington
d43df86201
Moving conditional logic into ensure_standard_variant
2015-05-22 12:20:31 +10:00
Maikel Linke
9c137ccf0f
provide tax_categories in spec
2015-05-22 11:03:21 +10:00
Maikel Linke
7e4751cb3a
updating bulk product js spec
2015-05-21 22:30:23 +10:00
Maikel Linke
e6b6303f5e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-21 18:03:11 +10:00
Maikel Linke
9c884b31a3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-21 18:01:16 +10:00
Maikel Linke
f017197221
orders list: filter by distributor and order cycle
2015-05-21 18:00:14 +10:00
Rob Harrington
cd44d43b3e
Adding price to line_item serializer (oops, forgot to include when merging in master)
2015-05-21 17:48:35 +10:00
Rob Harrington
903ed7e507
Merge branch 'master' into variable_weights
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
app/views/spree/api/line_items/bulk_show.v1.rabl
spec/features/admin/bulk_order_management_spec.rb
2015-05-21 17:31:33 +10:00
Rob Harrington
79a59e2e81
Add order_with_distributor factory
2015-05-21 13:34:32 +10:00
Maikel Linke
73884d4f01
BPE: Display notice about variant overrides
2015-05-21 13:01:28 +10:00
Maikel Linke
2ed519ef50
on_demand checkbox for variants
2015-05-21 12:37:10 +10:00
Maikel Linke
1936767084
BPE: new col for tax category
2015-05-21 11:06:08 +10:00
Rob Harrington
0b28771364
Removing unrequired specs for variant/product 'units_show'
2015-05-20 21:06:20 +10:00
Rob Harrington
1aca4657d9
Oops, switch managed_products to editable_products for Api::ProductsController
2015-05-20 20:59:06 +10:00
Rob Harrington
3431c687b8
Making sure every created by factories has a distributor
2015-05-20 20:54:27 +10:00
Rob Harrington
65a6329132
Products and inventory reports scopes products to visible in permissions
2015-05-20 16:19:08 +10:00
Rob Harrington
8132f07d88
Adding visible products method to permissions
2015-05-20 15:53:10 +10:00
Maikel Linke
1e26466d11
bulk product edit: "on demand" for new product
2015-05-20 15:29:35 +10:00
Maikel Linke
6953f61939
bulk product edit: new col "on demand"
2015-05-20 15:07:22 +10:00
Rob Harrington
01d4cf6ecf
Renaming managed_products permissions method to editable_products
2015-05-20 15:02:36 +10:00
Rob Harrington
05131de1ad
Use full_name on BOM instead of options_text
2015-05-20 14:11:31 +10:00
Maikel Linke
0a0bb67277
No SKU for cloned products. Community topic 175
2015-05-20 14:05:14 +10:00
Rob Harrington
8d73b2f532
involving... order cycle scopes return distinct OCs
2015-05-20 13:47:01 +10:00
Rob Harrington
c56efabfbe
Removing obsolete rabl templates
2015-05-20 11:52:49 +10:00
Rob Harrington
0ad2978926
Removing old managed route from api orders controller and switching BOM over to use new controller action
2015-05-20 11:48:48 +10:00
Rob Harrington
fc55a000b8
Adding managed controller action which uses new order serializer to render json
2015-05-20 11:48:13 +10:00
Rob Harrington
823adf3272
Translating existing order-related rabl templates accross to AMS
2015-05-20 11:45:48 +10:00
Rob Harrington
7f80c02c0e
Adding route for managed route for admin orders
2015-05-20 11:45:05 +10:00
Maikel Linke
828456118b
Remove forgotten binding.pry
2015-05-20 11:15:18 +10:00
Maikel Linke
fa87c53777
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into group-pages
2015-05-20 10:22:28 +10:00
Maikel Linke
6b956a8a38
Updating product clone spec
2015-05-20 10:19:37 +10:00
Maikel Linke
0c46f963ce
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-20 10:19:03 +10:00
Rob Harrington
312a6299a8
Making where clause unambiguous
2015-05-15 21:19:16 +10:00
Rohan Mitchell
f1899a7558
Merge branch 'master' into xero-report
2015-05-15 16:57:11 +10:00
Rohan Mitchell
70b5ac4785
Add column for whether the order has been paid for
2015-05-15 16:55:52 +10:00
Rohan Mitchell
f7642b2a1b
When blank values are submitted, do not override defaults
2015-05-15 16:51:04 +10:00
Rohan Mitchell
a467d3c379
Add filtering to xero invoices report - order date range, hub and order cycle
2015-05-15 16:20:56 +10:00
Rohan Mitchell
3d4a0f8407
Xero invoices report: Preserve form fields on submit, do not show rows with no cost
2015-05-15 15:27:46 +10:00
Rohan Mitchell
3640a71ab8
Reorder methods
2015-05-15 15:05:18 +10:00
Rohan Mitchell
ca37efdd26
Display whether there is tax included in shipping
2015-05-15 12:44:48 +10:00
Rohan Mitchell
dc8270ed72
Display amounts on xero invoice report
2015-05-15 12:35:20 +10:00
Rohan Mitchell
0dcd8eb8cc
Find adjustments with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
ca1d88d8b1
Find line items with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
5660e3737e
Extract order rows generation to method
2015-05-15 12:35:19 +10:00
Rohan Mitchell
c5b618b1f4
Admin can customise some fields on Xero invoices report
...
Add require for xero invoices report spec
2015-05-15 12:35:14 +10:00
Rohan Mitchell
0737ac8da0
Write an rspec table matcher that gives informative error messages
2015-05-15 12:35:14 +10:00
Rohan Mitchell
0a2f2e0fba
Output summary data without customisation
...
Add route for xero invoices report
Add require for reports controller decorator
2015-05-15 12:35:05 +10:00
Rohan Mitchell
38e1bd4139
Fix indentation
2015-05-15 12:17:16 +10:00
Rohan Mitchell
ef064819f9
Add spec for order_cycle_management report access
2015-05-15 10:41:29 +10:00
Rohan Mitchell
924492ec5b
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
2015-05-15 10:37:34 +10:00
Continuous Integration
e3723da65a
Auto-merge from CI [skip ci]
2015-05-14 14:32:07 +10:00
Rob Harrington
c8502747be
Fixing layout of customers index
2015-05-14 12:37:55 +10:00
Rob Harrington
78fc3e376b
Fixing styling of inputs for with pending/success/error status
2015-05-14 11:39:37 +10:00
Rob Harrington
50d0d04994
Removing obsolete dataSubmitter service
2015-05-14 11:38:55 +10:00
Rohan Mitchell
b4755c37dc
Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics
2015-05-14 11:03:27 +10:00
Rob Harrington
640c02570d
Splitting out specs for switchClass service
2015-05-13 16:41:28 +10:00
Rob Harrington
3849b39d3e
Splitting out specs for pending changes service
2015-05-13 16:39:43 +10:00
Rob Harrington
ffac0e4ceb
Adding ngTagsInput to angular spec manifest
2015-05-13 16:06:38 +10:00
Rob Harrington
a473d0ed11
Checking in db version change
2015-05-13 15:58:03 +10:00
Rohan Mitchell
b86872095a
Add google analytics
2015-05-13 14:52:17 +10:00
Rob Harrington
34f5cfb6b5
Completed orders require a customer, add association logic
2015-05-13 12:44:38 +10:00
Rob Harrington
1559b4e30a
Adding customer reference to orders
2015-05-13 12:44:37 +10:00
Rob Harrington
ed941e211d
Don't require a code on customer
2015-05-13 12:44:37 +10:00
Rob Harrington
dd9c192d48
Shuffling layout a little on customer index
2015-05-13 12:44:37 +10:00
Rob Harrington
b364994cc8
Adding tags input to customer index using ngTagsInput
2015-05-13 12:44:37 +10:00
Rob Harrington
3bc69242ce
Style tweaks
2015-05-13 12:44:37 +10:00
Rob Harrington
d2e8b23dd4
Creating association between enterprise and customers
2015-05-13 12:44:37 +10:00
Rob Harrington
5b3c9842e4
Adding acts_as_taggable to customer model
2015-05-13 12:44:36 +10:00
Rob Harrington
a03c7a5f22
Adding ngTagsInput to admin assets
2015-05-13 12:44:36 +10:00
Rob Harrington
a60fd3d388
Installing ngTagInput
2015-05-13 12:44:36 +10:00
Rob Harrington
4c5e75c3f9
Adding acts-as-taggable-on gem
2015-05-13 12:44:36 +10:00
Rob Harrington
5b49e64bf2
Hiding bulk checkboxes on customer interface (for now)
2015-05-13 12:44:36 +10:00
Rob Harrington
9add073b17
User can update customer code from customer index page
2015-05-13 12:44:36 +10:00
Rob Harrington
734ad21e82
Customers controller responds with json
2015-05-13 12:44:35 +10:00
Rob Harrington
dcde2d88ad
Adding Customer resource to resources service
2015-05-13 12:44:35 +10:00
Rob Harrington
4545e0ff95
Adding request defaults to index utils module
2015-05-13 12:44:35 +10:00
Rob Harrington
3890ba9a11
Wrapping pending changes service in a class
2015-05-13 12:44:35 +10:00
Rob Harrington
8f94390363
Moving a bunch of index related services from general admin module into indexUtils
2015-05-13 12:44:35 +10:00
Rob Harrington
a873278881
Moving line-item-upd-attr to indexUtils module, renaming to obj-for-update
2015-05-13 12:44:35 +10:00
Rob Harrington
2afd501af3
Wiring up update action for customers controller
2015-05-13 12:44:34 +10:00
Rob Harrington
8f35ccf007
Adding quick search and column dropdown to customers index
2015-05-13 12:44:34 +10:00
Rob Harrington
79d50a64ae
BPE uses columns controller from intex utils
2015-05-13 12:44:34 +10:00
Rob Harrington
3e7d331892
BOM uses columns controller from index utils module
2015-05-13 12:44:34 +10:00
Rob Harrington
3b7ab086c9
Fix module name
2015-05-13 12:44:34 +10:00
Rob Harrington
69ba8540c1
Moving toggle_column directive to index_utils
2015-05-13 12:44:33 +10:00
Rob Harrington
5bd842fe1a
Moving toggle_column directive to dropdown module
2015-05-13 12:44:33 +10:00
Rob Harrington
f5c0ae0f41
Moving dropdown to its own module folder and renaming
2015-05-13 12:44:33 +10:00
Rob Harrington
1c03e27686
Moving dropdown to its own folder
2015-05-13 12:44:33 +10:00
Rob Harrington
7a4f0e214c
Adding customers index view
2015-05-13 12:44:33 +10:00
Rob Harrington
307302038a
Adding customers controller, service and resource
2015-05-13 12:44:33 +10:00
Rob Harrington
c00c93816c
Renaming spec file
2015-05-13 12:44:32 +10:00
Rob Harrington
b3d314cfdb
Adding require line for index_utils module to all.js
2015-05-13 12:44:32 +10:00
Rob Harrington
b6d63d40c6
Pulling columns logic out into its own services/controller in a new indexUtils module
2015-05-13 12:44:32 +10:00
Rob Harrington
220f42fcf2
Customers controller serializes data for json requests, just renders view without data for html
2015-05-13 12:44:32 +10:00
Rob Harrington
37ff61d663
Adding basic routing to display customer index page
2015-05-13 12:44:32 +10:00
Rob Harrington
57dbc33a7b
Adding resource service to determine submission request based on object type
2015-05-13 12:44:31 +10:00
Rob Harrington
b16fa9cdc1
Generalising datasubmitter pendingChanges and watcher directive
2015-05-13 12:44:31 +10:00
Rob Harrington
30bb948d35
Making ofn-line-item-upd-attr work without ng-model
...
Conflicts:
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
2015-05-13 12:44:31 +10:00
Rohan Mitchell
3520127c41
Fix infinite job loop
2015-05-13 11:06:42 +10:00
Rick Giner
e801d6199a
Passing in $event in other views that call toggle()
2015-05-11 20:33:35 +10:00
Rick Giner
62ae38372e
#541 add "show more" link to producers lists in hub on home page
2015-05-11 20:31:24 +10:00
Rick Giner
b7c1a43125
Issue #540 Fix up hub list navigation
2015-05-10 18:13:30 +10:00
Rick Giner
98c1a95bd1
Issue #531 remove Google map road markers
2015-05-10 16:51:56 +10:00
Rick Giner
9c3ec950fc
Revert "ginerr_#531_remove Google map road markers"
...
This reverts commit 3e2117134f .
2015-05-10 16:50:58 +10:00
Rick Giner
3e2117134f
ginerr_#531_remove Google map road markers
2015-05-10 16:50:00 +10:00
Lynne
90dd1ea4a2
Merge pull request #1 from openfoodfoundation/variable_weights
...
Merging
2015-05-09 19:25:30 +01:00
Lynne Davis
26ee5c49b2
Fixing merge conflicts
2015-05-09 19:14:50 +01:00
Lynne Davis
3179887842
Do not allow line_item.unit_value to be updated if the variant.unit_value is zero
2015-05-09 19:12:24 +01:00
Lynne Davis
4d025ee7a9
Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.
2015-05-09 19:10:55 +01:00
Lynne Davis
521834bd76
Populate the line item unit value, when line_item created and update old data in migration
2015-05-09 19:10:55 +01:00
Lynne Davis
662c7fe368
Removing notes to myself from this file
2015-05-09 19:10:55 +01:00
Lynne Davis
54da7ae241
Adding additional logic for if the line_item unit_value is nil
2015-05-09 19:10:55 +01:00
Lynne Davis
2a991ad130
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-05-09 19:10:55 +01:00
Lynne Davis
2f463474fb
Adding specs for variable weight adjustment via builk order management
2015-05-09 19:10:55 +01:00
Lynne Davis
f7ade48e86
Update DB schema to store updatable weight on items sold
2015-05-09 19:10:55 +01:00
Continuous Integration
3d0880857a
Auto-merge from CI [skip ci]
2015-05-08 16:24:39 +10:00
Continuous Integration
df14c10608
Auto-merge from CI [skip ci]
2015-05-08 13:45:56 +10:00
Rohan Mitchell
1531c476e3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
2015-05-08 13:45:31 +10:00
Rohan Mitchell
e8c8d8885c
Merge branch 'master' into single-order-patches
2015-05-08 12:42:56 +10:00
Rohan Mitchell
6fb3fa55a1
Allow extended time for all parts of this spec to fix intermittent fails
2015-05-07 14:23:58 +10:00
Rob Harrington
f3f0766279
Adding a distributor to order cycle to fix broken feature spec
2015-05-07 12:50:57 +10:00
Rob Harrington
0d5ce5ff57
Fixing issues with reports controller spec
2015-05-07 12:50:57 +10:00
Rob Harrington
68b4cb59be
Fixing bulk management specs broken by making order_cycles filter update dates
2015-05-07 12:50:57 +10:00
Rob Harrington
f88fdac710
Adding module - doh!
2015-05-07 12:50:56 +10:00
Rob Harrington
a7019e7e78
Adding permissions method for order report enterprises
2015-05-07 12:50:56 +10:00
Rob Harrington
bd66091d75
Push logic for checking of user super admin status down into private method
2015-05-07 12:50:56 +10:00
Rob Harrington
d8f5669fbb
Renaming granted > related_enterprises_granted
2015-05-07 12:50:56 +10:00
Rob Harrington
5806f50a84
Renaming granting > related_enterprises_granting
2015-05-07 12:50:56 +10:00
Rob Harrington
5cd528a87d
Removing obsolete related_enterprises_with permission method
2015-05-07 12:50:56 +10:00
Rob Harrington
f0f7e0ee2f
Making permissions method managed_and_related_enterprise_with method more specific
2015-05-07 12:50:56 +10:00
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
0a03483e36
Adding permissions methods for visible and editable orders and line_items
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
bd6bac8874
Display deployment output in real time
...
This reverts commit 485eee4bdd .
2015-05-06 20:02:22 +10:00
Rohan Mitchell
50d2ddc05f
Add progress comments
2015-05-06 20:00:50 +10:00
Rohan Mitchell
10b7a86745
Add debugging to merge script
2015-05-06 19:50:06 +10:00
Rohan Mitchell
6d33dc5070
Add script to merge master into the current branch if required before running specs
2015-05-06 19:41:36 +10:00
Rohan Mitchell
d109e898d2
Preserve newlines when displaying deploy script output
2015-05-06 19:38:20 +10:00
Rohan Mitchell
3dee29cd12
Remove build badge - master branch is always green
2015-05-06 19:37:21 +10:00
Rohan Mitchell
0921cd2dfa
Merge branch 'master' into single-order-patches
2015-05-06 18:13:55 +10:00
Rohan Mitchell
7b4130972b
Fix first feature spec sometimes timing out
2015-05-06 18:12:17 +10:00
Rohan Mitchell
485eee4bdd
Deploy scripts display their output
2015-05-06 18:07:50 +10:00
Rohan Mitchell
f84e704d99
Retry simple push-to-master script
2015-05-06 17:59:36 +10:00
Rohan Mitchell
ad7e5a45bb
Add updated merge script
2015-05-06 17:58:36 +10:00
Rohan Mitchell
d9404d3332
Merge branch 'master' into single-order-patches
2015-05-06 17:29:23 +10:00
Rohan Mitchell
e43d726b97
Merge branch 'master' into payments-report-fix
2015-05-06 14:55:10 +10:00
Rob Harrington
8788322492
Alllowing payments in payment reports to access soft-deleted payment methods
2015-05-06 11:10:50 +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
Rick Giner
3fc616cdff
bind-once on hubs
2015-05-03 14:11:09 +10:00
Rick Giner
16e9f0545b
bind-once in products
2015-05-03 14:02:33 +10:00
Rick Giner
a3664d4448
Added bindonce and ng-if improvements to Producers templates
2015-05-03 12:51:59 +10:00
Maikel Linke
11acb3ba59
Allow to remove adjustments
...
Managers of an order cycle and the distributor of an order are allowed
to remove an adjustment from the order.
2015-05-01 15:59:46 +10:00
Maikel Linke
2edf5aeccd
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-01 15:05:14 +10:00
Maikel Linke
993183f2f5
updating js spec: cloning product calls insertProductAfter now
2015-05-01 15:04:12 +10:00
Rohan Mitchell
e91de69d5a
Merge branch 'master' into pin-refunds
2015-05-01 14:58:19 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25 .
2015-05-01 14:55:26 +10:00
Maikel Linke
7c55285708
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-01 14:50:51 +10:00
Maikel Linke
e6e063670c
Allow managers to remove line items from order
...
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
2015-05-01 14:49:34 +10:00
Rohan Mitchell
153604dd64
Merge branch 'single-order-patches'
2015-05-01 14:39:17 +10:00
Maikel Linke
b7bac326bd
admin order edit: re-label update button to "update and recalculate fees"
2015-05-01 12:05:43 +10:00
Rohan Mitchell
a6cecdcc25
Display header for Xero invoices report
2015-05-01 11:59:52 +10:00
Maikel Linke
baabb5c07f
fixing BPE feature spec
2015-05-01 11:30:26 +10:00
Maikel Linke
66f847f673
showing save button at the bottom as well
2015-04-30 17:22:54 +10:00
Maikel Linke
af78859db6
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-30 17:18:02 +10:00
Maikel Linke
295da25dd2
insert clone after cloned product
2015-04-30 17:17:28 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Rohan Mitchell
2c7a5c0656
Update Spree - fixes bug where Payment#method_missing depends on #provider already called.
2015-04-30 15:49:48 +10:00
Rohan Mitchell
0b652a2113
Add refund icon
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b498c28632
Payments can be refunded
2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2
Pin payments can't void or credit, but they can refund
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b09ae550c8
Add spec for payment actions
2015-04-30 15:49:48 +10:00
Rohan Mitchell
f4df227ef0
Buildkite should now support Fuubar
2015-04-30 13:54:27 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Maikel Linke
ecf635e080
handle missing bill_address on admin order page
2015-04-29 14:32:13 +10:00
Maikel Linke
2e66a082eb
add customer notes to admin order index page
2015-04-29 14:31:59 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Rohan Mitchell
3b61d7a1e0
Add ref for country ISO codoes
2015-04-29 14:12:08 +10:00
Rohan Mitchell
c3f99d7540
Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country
2015-04-29 14:07:58 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Maikel Linke
e82a3a9d82
add ship button to admin order index page
2015-04-29 12:30:05 +10:00
Maikel Linke
8511bd19ce
add ship button to order edit page
2015-04-29 12:03:49 +10:00
Maikel Linke
1268108877
handle ship event on order
2015-04-29 12:03:11 +10:00
Maikel Linke
2b0f867ed8
new order method ready_to_ship?
2015-04-29 11:42:35 +10:00
Rob Harrington
a253b88525
Fixing line item controller spec
2015-04-29 10:42:38 +10:00
Lynne Davis
9e61a7d083
Adding report type drop down to order_cycle_management_report
2015-04-26 11:03:32 +01:00
Lynne Davis
6bbd3f7c13
Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization.
2015-04-26 11:02:06 +01:00
Lynne Davis
d344c3dec8
Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.
2015-04-24 16:22:17 +01:00
Lynne Davis
6045283549
Populate the line item unit value, when line_item created and update old data in migration
2015-04-24 16:17:00 +01:00
Lynne Davis
162a565140
Removing notes to myself from this file
2015-04-24 16:14:24 +01:00
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Rob Harrington
505fd8ff96
Merge branch 'properties' of github.com:openfoodfoundation/openfoodnetwork into properties
2015-04-24 17:20:41 +10:00
Rob Harrington
b1b1bfd8f6
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
2015-04-24 16:05:39 +10:00
Maikel Linke
f94a5a975a
Edit Order: resend button uses new pretty template.
2015-04-24 15:31:45 +10:00
Rohan Mitchell
29faa5f3c6
Merge branch 'master' into properties
2015-04-24 15:14:52 +10:00
Rohan Mitchell
8e2c224d4d
cd before sourcing includes
2015-04-24 15:00:49 +10:00
Rohan Mitchell
bb2f2a6f54
Also stop delayed job before loading staging baseline
2015-04-24 15:00:38 +10:00
Rob Harrington
dab3b59f6a
Merge branch 'master' into properties
2015-04-24 14:00:08 +10:00
Rob Harrington
bdf462926d
Ensure that producer properties have a position
2015-04-24 13:05:01 +10:00
Maikel Linke
355221a273
Adding customer name to order edit page heading
2015-04-24 12:33:25 +10:00
Rob Harrington
ad2df56bf1
Merge branch 'require_standard_variant' of github.com:openfoodfoundation/openfoodnetwork into require_standard_variant
2015-04-24 12:19:27 +10:00
Rohan Mitchell
9149276048
Kill any postgres connections before dropping and recreating database
2015-04-24 12:17:39 +10:00
Rob Harrington
ed7b763ecf
UnitsCtrl can interpret unit_value_with_description without a separating space
2015-04-24 12:15:35 +10:00
Rob Harrington
05c350b5ff
Refactoring unitsCtrl
2015-04-24 11:27:47 +10:00
Rob Harrington
c66a7e44b6
Updating product model specs to reflect changes to properties
2015-04-23 15:37:41 +10:00
Rob Harrington
9eb99d1c4a
Merge branch 'master' into properties
2015-04-23 14:18:30 +10:00
Rob Harrington
57be445bd4
Merge branch 'master' into require_standard_variant
2015-04-23 14:18:11 +10:00
Rob Harrington
6cde1f7732
Add tooltip with value for selectors
2015-04-23 14:11:50 +10:00
Rob Harrington
7b83438b5e
Pulling property values into the shopfront
2015-04-23 13:51:49 +10:00
Rob Harrington
e6a98747b4
correction in read only logic for filter selectors
2015-04-23 13:32:56 +10:00
Rob Harrington
ed15b95de0
Adding properties and taxons to producer modal
2015-04-23 12:31:20 +10:00
Rob Harrington
3df2720b31
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
2015-04-23 12:31:06 +10:00
Maikel Linke
eff8681d9b
Merge branch 'master' into single-order-patches
2015-04-23 12:11:44 +10:00
Maikel Linke
a937fd3c61
Using variant overrides in variant seach on order edit page
2015-04-23 11:37:10 +10:00
Maikel Linke
3412bc25bf
Edit Orders: more variant info in variant search
...
Displaying variant's full name and the producer's name.
2015-04-23 10:17:01 +10:00
Maikel Linke
f1a8011e13
Documentation of Variant.full_name
...
The code was confusing for all developers here. Maybe a bit of doco
helps.
2015-04-23 10:02:32 +10:00
Rohan Mitchell
f70bfee481
Merge branch 'master' into require_standard_variant
2015-04-23 09:56:41 +10:00
Rohan Mitchell
92e03e208f
Extract load_environment method
2015-04-23 07:23:34 +10:00
Rob Harrington
76d6345ab5
Merge remote-tracking branch 'origin/master' into require_standard_variant
2015-04-22 21:02:47 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
1c617994fc
User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from
2015-04-22 21:02:07 +10:00
Rob Harrington
4a4b3da551
Using properties_including_inherited for product properties on the shop page
2015-04-22 21:02:07 +10:00
Rob Harrington
e546388784
Rename properties_h to properties_including_inherited
2015-04-22 21:02:07 +10:00
Rob Harrington
976c24cf4c
properties_h uses inherit_properties flag, and returns property id rather than presentation
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
Rob Harrington
1f293bb787
Adding inherits properties flag to products
2015-04-22 21:02:06 +10:00
Rob Harrington
a4a41ae26a
Refactor properties_h
2015-04-22 21:02:06 +10:00
Rohan Mitchell
7aeeb6d18f
Add script to run JS specs in CI
2015-04-22 16:36:31 +10:00
Rohan Mitchell
7a78f4870a
Use phantomjs for js specs, so we can run them in CI
2015-04-22 16:33:44 +10:00
Rohan Mitchell
28c79cdb50
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
2015-04-22 15:01:22 +10:00
Rohan Mitchell
b9e3ff54b8
Add build script to merge to master
2015-04-22 14:47:54 +10:00
Rohan Mitchell
0c0be0112e
Update paths to include ci
2015-04-22 14:31:30 +10:00
Rohan Mitchell
883a2e0a0e
WIP: Move CI scripts to their own folder
2015-04-22 14:29:59 +10:00
Rohan Mitchell
6c81109b17
Local branch isn't checked out, so we need to test remote branch
2015-04-22 14:17:07 +10:00
Rohan Mitchell
1c9a95b3d6
Set execute bit
2015-04-22 13:19:17 +10:00
Rohan Mitchell
53c4c8b5b7
Push to staging fails unless master has been merged into current branch
2015-04-22 13:16:39 +10:00
Rohan Mitchell
d406f9ccdf
Tests fail unless master has been merged into current branch
2015-04-22 13:14:51 +10:00
Rohan Mitchell
7d4a4f8f9d
Pushing to staging first loads staging baseline data
2015-04-22 12:55:36 +10:00
Rohan Mitchell
35536a629c
Set execute bit
2015-04-22 12:55:36 +10:00
Rob Harrington
699a28e14c
Merge branch 'master' into require_standard_variant
2015-04-22 10:58:43 +10:00
Rohan Mitchell
7b8938b5f6
Run password reset job for spec that requires it
2015-04-22 07:32:22 +10:00
Rohan Mitchell
b2717ffca0
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
2015-04-21 16:40:45 +10:00
Rohan Mitchell
700cb73b8f
Send enterprise confirmation emails asynchronously
2015-04-21 16:19:02 +10:00
Rohan Mitchell
9d225142c8
Send password reset instructions asynchronously
2015-04-21 16:10:40 +10:00
Rohan Mitchell
998288e21f
Keep failed jobs around for debugging. Limit max runtime to 15 mins (we're only sending emails at present). Notify bugsnag of errors in jobs.
2015-04-21 15:37:36 +10:00
Rohan Mitchell
9f93c9f221
Swap Jenkins build badge out for Buildkite
2015-04-21 15:17:34 +10:00
Rohan Mitchell
22127b2d18
Use progress formatter for less verbose CI output. I miss Fuubar formatter, though.
2015-04-21 15:17:34 +10:00
Rohan Mitchell
692e58e8f7
Output spec-by-spec results to track specs-hanging-at-90-percent issue
2015-04-21 10:52:14 +10:00
Rohan Mitchell
4158663e9a
Pushing to production saves staging baseline data
2015-04-21 10:47:36 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
Rob Harrington
ff2e6d9ca4
Test deletion rather than destruction on variant model spec
2015-04-17 17:25:13 +10:00
Maikel Linke
893b743973
tidy (rm comment)
2015-04-17 17:00:18 +10:00
Maikel Linke
03fd148f41
showing profile modals on groups/hubs
2015-04-17 16:58:49 +10:00
Rob Harrington
72d553ef0c
Test actual deletion of variants
2015-04-17 16:51:02 +10:00
Rob Harrington
63353ebace
Don't try and delete the only variant, that will never work!
2015-04-17 16:49:14 +10:00
Rohan Mitchell
a1673afff0
Allow more time for phantomjs, required by first admin spec where assets are compiled
2015-04-17 15:46:51 +10:00
Rohan Mitchell
0d4dbd23fd
Remove redundant spec line, test that sells is not changed
2015-04-17 15:42:42 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rob Harrington
46690faffb
Fixing Darkswarm Angular Product Controller spec
2015-04-17 15:14:19 +10:00
Rob Harrington
32f14bca00
Preventing fitting of selectors when there are none
2015-04-17 15:10:41 +10:00
Rohan Mitchell
042e076b58
Fix tax-related spec failures
2015-04-17 14:46:32 +10:00
Rob Harrington
6d96a7a60b
Specifiy that allSelectors attribute on filterSelectors directive is optional
2015-04-17 14:43:09 +10:00
Rob Harrington
c8bf207187
Fixing trial expiry test
2015-04-17 14:33:47 +10:00
Rohan Mitchell
9e8483348f
Fix spec - enterprise needs to charge sales tax for tax to be charged
2015-04-17 13:41:38 +10:00
Rohan Mitchell
81324f3cc4
Do not charge tax on shipments when distributor does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0b8a619274
When the order does not have a hub, all tax rates apply
2015-04-17 13:41:38 +10:00
Rohan Mitchell
048c6a8ee8
Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues
2015-04-17 13:41:38 +10:00
Rohan Mitchell
3e8801b12b
Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
a6a5fdfb3b
Require that the user selects whether their enterprise charges sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241
User can set whether an enterprise charges sales tax when registering
2015-04-17 13:41:38 +10:00
Rohan Mitchell
05551aa2a9
Make helpers available to javascript templates
2015-04-17 13:41:38 +10:00
Rohan Mitchell
9bbc151cae
Admin can set enterprises to charge or not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
08fef890ec
Do not show tax lines if there is no tax on the order
2015-04-17 13:41:14 +10:00
Rohan Mitchell
a93633a626
Show tax on order confirmation emails
2015-04-17 13:41:14 +10:00
Rohan Mitchell
4bd1ff2011
Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication
2015-04-17 13:40:08 +10:00
Rohan Mitchell
2914990444
Add save_and_open spec helper method to open HTML emails in the browser
2015-04-17 13:40:08 +10:00
Rohan Mitchell
3ce2c5b84f
Show tax on order confirmation page
2015-04-17 13:40:08 +10:00
Rohan Mitchell
77d7255243
Use short syntax for rendering partials
2015-04-17 13:39:10 +10:00
Rohan Mitchell
6bb926f811
Do not show tax in checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
829d11d4b2
Deliver a warning if attempting to create an invalid taxed_product from factory
2015-04-17 13:39:09 +10:00
Rohan Mitchell
beec910445
Display tax in cart
2015-04-17 13:39:09 +10:00
Rohan Mitchell
68f0e51c02
Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc.
2015-04-17 13:39:09 +10:00
Rohan Mitchell
210c76eddc
Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
e75c6a8e1d
Add helper to display total tax on an order
2015-04-17 13:39:09 +10:00
Rob Harrington
b44f2bcdf5
Fixing trial expiry test
2015-04-17 13:30:36 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
0cf8b017b9
Pulling out taxons and properties placeholders from producer and product modals
2015-04-17 13:20:01 +10:00
Rob Harrington
b9f19d5777
Fixing broken specs
2015-04-17 13:00:20 +10:00
Rob Harrington
9ee25c4e42
Making spec better
2015-04-17 11:25:18 +10:00
Rob Harrington
2d7fb3fd67
Updating name of spec
2015-04-17 11:25:18 +10:00
Rob Harrington
7596270154
A few more changes to tidy up standard variant migration
2015-04-17 11:25:18 +10:00
Rob Harrington
5d9e861ee4
Working migration to complete deprecation of master variants
2015-04-17 11:25:18 +10:00
Rob Harrington
447a5481a3
WIP: Building migration to duplicate master variants
2015-04-17 11:25:18 +10:00
Rob Harrington
8248e382f3
Greying out disabled action button
2015-04-17 11:25:18 +10:00
Rob Harrington
4b182f9248
Can't delete final variant on a product from BPE
2015-04-17 11:25:18 +10:00
Rob Harrington
2b47c9145a
Cannot delete last variant of product
2015-04-17 11:25:17 +10:00
Rob Harrington
fcb3bc894b
Cleanup
2015-04-17 11:25:17 +10:00
Rob Harrington
a223a2d662
Cannot remove all variants from a product
2015-04-17 11:25:17 +10:00
Rob Harrington
5e2fe56c22
Cleanup
2015-04-17 11:25:17 +10:00
Rob Harrington
89afbc80a6
Set initial on_hand to 0
2015-04-17 11:25:17 +10:00
Rob Harrington
971723964e
Update outdated spec
2015-04-17 11:25:17 +10:00
Rob Harrington
28486f9e76
Only adds standard variant on create
2015-04-17 11:25:17 +10:00
Rob Harrington
869551a17c
Adding a standard variant again
2015-04-17 11:25:17 +10:00
Rob Harrington
13a910c372
Replace validates_associated on master with current spree method for error reporting master saves
2015-04-17 11:25:17 +10:00
Rob Harrington
0a7b01ff07
Product requires variant_unit and master requires unit_value and/or unit_desc
2015-04-17 11:25:16 +10:00
Rob Harrington
dfb513cce7
Use after_create callback to duplicate master variant
2015-04-17 11:25:16 +10:00
Rob Harrington
3f01a459ac
Adding a standard variant upon initialisation of a new instance of Spree::Product
2015-04-17 11:25:16 +10:00
Rohan Mitchell
2b5fc656fe
Configure delayed job logging, add startup script for monit
2015-04-17 10:40:25 +10:00
Rob Harrington
524f02717b
Don't redirect to root when closing login window on checkout page
2015-04-17 10:25:38 +10:00
Rob Harrington
456a6f94f5
On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager
2015-04-17 10:24:37 +10:00
Rob Harrington
afe77925ba
Allow request to specify a return value when calling user_passwords#edit
2015-04-17 10:21:25 +10:00
Rob Harrington
5940ff2b2c
Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead
2015-04-16 16:56:27 +10:00
Rohan Mitchell
d1ab2d9dac
Add daemons gem for Delayed::Job
2015-04-16 16:54:43 +10:00
Rohan Mitchell
ccc1f3df40
Feature specs test email sending through delayed jobs
2015-04-16 16:54:43 +10:00
Rohan Mitchell
e9fbd74e88
Send emails via jobs instead of synchronously
2015-04-16 16:54:43 +10:00
Rohan Mitchell
bb3bdf37cd
Add jobs for user, order and enterprise emails
2015-04-16 16:54:43 +10:00
Rohan Mitchell
af4baabb50
Include DelayedJobHelper for specs
2015-04-16 16:54:43 +10:00
Rohan Mitchell
3bbf42c3e7
WIP: Rename delayed job support to delayed job helper
2015-04-16 16:54:43 +10:00
Rohan Mitchell
530740158c
Tolerate no jobs previously in queue
2015-04-16 16:54:43 +10:00
Rohan Mitchell
771b9e0df5
Improve syntax: take job class as a separate argument
2015-04-16 16:54:43 +10:00
Rohan Mitchell
1d5a4c93e4
Add delayed job testing support, original credit Mat Holroyd and Rohan Mitchell, from CERES Fairfood project
2015-04-16 16:54:43 +10:00
Rohan Mitchell
61cb2514cd
Add Delayed::Job
2015-04-16 16:54:43 +10:00
Rohan Mitchell
aef3fdf4b4
Merge branch 'group-pages'
2015-04-16 16:53:49 +10:00
Rohan Mitchell
a384f5e3d4
Merge branch 'buildkite' into customer-totals-report-and-perms-fix
2015-04-16 14:08:39 +10:00
Rohan Mitchell
318957551f
Freeze time to make spec repeatable
2015-04-16 14:07:38 +10:00
Rohan Mitchell
e017c30ab7
Do not double-run db:test:prepare
2015-04-16 14:07:37 +10:00
Rohan Mitchell
23888b7576
chmod +x
2015-04-16 14:07:37 +10:00
Rohan Mitchell
ff07707af7
Symlink it right
2015-04-16 14:07:37 +10:00
Rohan Mitchell
78bf87614a
Buildkite: Symlink config/application.yml if not present
2015-04-16 14:07:37 +10:00
Rohan Mitchell
2b50f993de
Load environment before attempting build
2015-04-16 14:07:37 +10:00
Rohan Mitchell
4672cc4863
Add buildkite scripts
2015-04-16 14:07:37 +10:00
Rohan Mitchell
768cfab591
Change field text at checkout
2015-04-16 10:59:15 +10:00
Rohan Mitchell
7f973604e5
Add columns to customer totals report: order cycle, payment method, customer code, tags, billing address
2015-04-16 10:59:15 +10:00
Rohan Mitchell
7f6c02ca29
Add User#customer_of to look up customers
2015-04-16 10:59:15 +10:00
Rohan Mitchell
34d1841d22
Make Variant#full_name resilient to regex chars
2015-04-16 10:59:15 +10:00
Rohan Mitchell
e570352a1b
Grant fewer permissions on enterprise creation
2015-04-16 10:59:15 +10:00
Rohan Mitchell
2e021941d1
Fix bug where new enterprises should be created as hubs, but aren't
2015-04-16 10:59:15 +10:00
Rohan Mitchell
48bf87ec73
Perpetually updating copyright year
2015-04-16 10:59:15 +10:00
Maikel Linke
548e3576b9
textAngular editor for group description
2015-04-15 17:13:10 +10:00
Maikel Linke
201bcb133a
show profiles checkbox on groups hubs page
2015-04-15 16:15:21 +10:00
Rob Harrington
0c155e6e3a
Display message when email has not been confirmed for new enterprise
2015-04-15 15:32:17 +10:00
Lynne Davis
83981fbb15
Adding additional logic for if the line_item unit_value is nil
2015-04-14 17:29:56 +01:00
Rob Harrington
2072744870
User can enter the number of months back to search for order cycles from which to build relationships
2015-04-12 11:38:18 +10:00
Rob Harrington
0f9fbe6e8c
Preventing relationships from being created with self
2015-04-12 10:53:22 +10:00
Rob Harrington
b24cad7aeb
Providing access to order_cycle_permissions in order cycles controller
2015-04-11 23:25:30 +10:00
Rob Harrington
bc89018ee1
Refer to the right variable doofus
2015-04-11 23:24:50 +10:00
Rob Harrington
88bae32971
Adding method: user_manages_coordinator_or(enterprise) to make code a bit more terse
2015-04-11 23:00:34 +10:00
Rob Harrington
6f81a9ba18
Save common permission method results as instance variables
2015-04-11 22:53:57 +10:00
Rob Harrington
22a37cdc8a
Rename managed_producers_in as managed_participating_producers
2015-04-11 22:44:32 +10:00
Rob Harrington
9c376f0b00
Rename managed_hubs_in as managed_participating_hubs
2015-04-11 22:32:15 +10:00
Rob Harrington
59a2c84857
Rename managed_enterprises_in as managed_participating_enterprises
2015-04-11 22:30:21 +10:00
Rob Harrington
6ac45f3dc8
Renaming order_cycle_exchanges as visible_exchanges
2015-04-11 22:26:55 +10:00
Rob Harrington
e3138c3cd2
Renaming order_cycle_enterprises_for as visible_enterprises
2015-04-11 22:25:23 +10:00
Rob Harrington
26d55baa35
Moving order cycle permissions to their own permissions class
2015-04-11 21:11:10 +10:00
Rob Harrington
02f8f293da
Only allow managers or coordinator to add/remove fees from exchanges
2015-04-11 18:32:04 +10:00
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rob Harrington
24e3c9a9e1
Adding bugsnag notify block for catching naughty phantom fees
2015-04-10 16:41:10 +10:00
Rob Harrington
8b7d321dfe
Changing delete time to ensure not_deleted scope works
2015-04-10 16:40:33 +10:00
Rob Harrington
72403fd021
Fixing broken enterprise controller spec
2015-04-10 13:16:21 +10:00
Maikel Linke
1e168afd71
giving the enterprise serializer the active_distributors
2015-04-10 12:55:20 +10:00
Rob Harrington
1e6fd94663
Adding rake task to create E2E relationships with P-OC based on past order_cycles
2015-04-10 12:51:15 +10:00
Rob Harrington
96c173414b
Adding has_permission method to enterprise_relationship
2015-04-10 12:48:27 +10:00
Rob Harrington
226e2f0e2c
Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor
2015-04-10 09:26:20 +10:00
Rob Harrington
2280a71b23
Replace for_order_cycle rabl template with a serializer
2015-04-10 09:25:40 +10:00
Rob Harrington
6f24e969ce
Removing stupid unusable spec
2015-04-09 17:20:31 +10:00
Maikel Linke
e26ebf4239
Serialize only activated hubs and producers of an enterprise
2015-04-09 17:15:57 +10:00
Rob Harrington
81a745420e
Only check editable status of variants when actually selecting
2015-04-09 15:24:45 +10:00
Rob Harrington
c28ebf63ab
As participating Hub, I cannot edit incoming exchanges despite being granted P-OC by the producer
2015-04-09 13:41:43 +10:00
Rob Harrington
69004ac477
Select all box only selects variants I have permission to edit
2015-04-09 13:29:25 +10:00
Rob Harrington
430320e3f9
Oopsie!
2015-04-09 13:28:41 +10:00
Rob Harrington
60a3d8e0d1
Restrict bulk updating order cycles at controller level
2015-04-09 12:27:43 +10:00
Rob Harrington
8a3126f117
Using helper to disable form elements on order cycle index page
2015-04-09 11:11:46 +10:00
Rob Harrington
c7157ce7bd
Applying new helper to order cycle name and timing partial
2015-04-09 11:11:06 +10:00
Rob Harrington
133f7e4ec7
Add viewing_as_coodinator_of? helper method
2015-04-09 11:10:56 +10:00
Rob Harrington
fbcfe9b2a4
Add viewing_as_coordiantor flag to serialized order cycles and a managed flag to serialized enterprises for_order_cycle(s)
2015-04-09 10:31:17 +10:00
Rob Harrington
adc1b639bc
Merge remote-tracking branch 'origin/master' into complex_oc
2015-04-08 14:38:27 +10:00
Rob Harrington
61a9e2f7cc
Add a referer for all admin enterprise controller specs
2015-04-08 14:36:56 +10:00
Rob Harrington
f6e635466b
Rearranging elements on the order cycle form a little bit
2015-04-08 14:31:18 +10:00
Rob Harrington
32cc17745a
Non-coordinating user cannot alter important attributes of order cycle
2015-04-08 14:12:49 +10:00
Rob Harrington
b1624a733e
Editable variants for incoming exchanges for hubs include those for producers that have granted my hub P-OC
2015-04-08 13:38:37 +10:00
Rob Harrington
b8ce6ed0fc
Coordinator can see any enterprises that are already in the order cycle
2015-04-08 13:28:49 +10:00
Rob Harrington
104a8ddecf
Refactor order_cycle_enterpises_for permission method, now requires an order cycle
2015-04-08 13:00:17 +10:00
Rob Harrington
4dcfec1de9
make enterprises_for_order_cycle permissions more correct
2015-04-08 12:12:02 +10:00
Rob Harrington
8859aa27ee
Slight refactor of order cycle enterprises
2015-04-08 10:33:32 +10:00
Rob Harrington
24062e5585
Adding permissions for outgoing hubs to see producers whose variants they are distributing, despite P-OC not existing
2015-04-08 10:15:50 +10:00
Rob Harrington
4a87798bb4
Variants belonging to a producer I manager that are already in an outgoing an exchange need not be editable
2015-04-06 23:30:43 +10:00
Rob Harrington
ae1681b790
Not 1! Zero!
2015-04-06 23:29:15 +10:00
Rob Harrington
36c5cdf556
Only show enterprises with fees in order cycle edit page
2015-04-06 14:08:10 +10:00
Rob Harrington
d516795774
Fetching Enterprise Fees for order cycle, using new enterprisefee serializer
2015-04-06 13:06:21 +10:00
Rob Harrington
7eb735f87e
Adding for_enterprises scope on enterprise fee
2015-04-06 10:24:40 +10:00
Rob Harrington
7448d41b27
Adding abilities for new for_order_cycle action
2015-04-06 10:23:39 +10:00
Rob Harrington
7ebea23fda
Adding route for now for_order_cycle action on enterprise fees
2015-04-06 10:23:08 +10:00
Rob Harrington
b7de8353bc
Renaming existing enterprise fee serializer as basic...
2015-04-06 09:47:37 +10:00
Rob Harrington
52dc313e70
Implementing editable variant scopes in order_cycle_applicator
2015-04-06 09:20:39 +10:00
Rob Harrington
a4b80b1f33
Implement editable scope for variants on order cycles page
2015-04-06 09:15:14 +10:00
Rob Harrington
f20844c2a0
Adding editable scope for variants in outgoing exchanges
2015-04-05 15:25:44 +10:00
Rob Harrington
136d361134
Fixing comment
2015-04-05 14:14:47 +10:00
Rob Harrington
009b25a491
Adding an editable variants scope for incoming exchanges
2015-04-05 13:59:00 +10:00
Rob Harrington
bf87394a76
Fixing order cycle feature spec
2015-04-05 10:58:06 +10:00
Lynne Davis
ff935af18b
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-04-04 19:20:56 +01:00
Lynne Davis
ffd850c761
Adding specs for variable weight adjustment via builk order management
2015-04-04 19:20:41 +01:00
Lynne Davis
bf44a1c862
Update DB schema to store updatable weight on items sold
2015-04-04 19:20:27 +01:00
Rob Harrington
d28fc7e42d
Hubs can see incoming exchanges of producers who have given them P-OC or whose variants they are actively distributing
2015-04-03 14:58:01 +11:00
Rob Harrington
a10de68430
only load permissions once in serializer
2015-04-02 15:55:03 +11:00
Rob Harrington
3b9824171a
Adding with_order_cycles_as_supplier_outer scope to Enterprise
2015-04-02 15:53:32 +11:00
Rob Harrington
5d7659aa3c
Fixing product spec, using have_select2 instead of have_field
2015-04-02 14:36:19 +11:00
Rob Harrington
1e1d52cc47
Adding 'selected' option to have_select2 matcher
2015-04-02 14:35:39 +11:00
Rob Harrington
76648b97b0
Update spec, properties must exist for enterprise users before they can be assigned
2015-04-02 14:15:00 +11:00
Rob Harrington
5020eb4e32
And again: override redirect to index page when editing properties from edit page
2015-04-02 14:14:16 +11:00
Rob Harrington
cb376602f2
Override redirect to index page when editing properties from edit page
2015-04-02 14:03:51 +11:00
Rob Harrington
3aa5f6e023
Adding properties tab to admin enterprise edit form
2015-04-02 11:30:32 +11:00
Rob Harrington
8926e3765e
Replace free text with with select dropdown for product property names when not super admin
2015-04-02 08:57:15 +11:00
Rob Harrington
5b235f356e
Replace free text with with select dropdown for property names when not super admin
2015-04-02 08:56:36 +11:00
Rob Harrington
8ed6653dc4
Ignoring any new product properties submitted by a non-admin user
2015-04-02 08:55:20 +11:00
Rob Harrington
ca1a5b5f8d
Ignoring any new producer properties submitted by the user
2015-04-02 08:54:35 +11:00
Rob Harrington
8d95ba2c69
Display full name of variant on order cycle edit form
2015-04-01 15:46:19 +11:00
Rob Harrington
94a88278a9
Ignore the unit_to_display when it is wholly contained within display_name or vice versa
2015-04-01 15:46:11 +11:00
Rob Harrington
588e036c1d
Adding SKU to customer totals report
2015-04-01 14:45:23 +11:00
Rob Harrington
aa7ddbcba4
Renaming Dist. column to Admin & Handling
2015-04-01 14:38:15 +11:00
Rob Harrington
54af6886c2
Line items with a quantity of zero return price_with_adjustments of 0.0
2015-04-01 12:34:22 +11:00
Rob Harrington
d49dd62124
Replace unused bugsnag notification with one to test for line items with a quantity of zero
2015-04-01 11:38:06 +11:00
Paul Mackay
d4cf44a6dd
Use COUNTRY_CODE instead of COUNTRY in application.yml.
2015-03-29 17:06:05 +01:00
Rob Harrington
6e77a5eebc
Using the correct method name duh
2015-03-27 16:47:12 +11:00
Rob Harrington
2d5118290b
Fixing broken order cycle feature specs
2015-03-27 16:19:52 +11:00
Rob Harrington
74b7feda53
coordinator of a simple order cycle has permission to add their own variants to outgoing exchanges
2015-03-27 16:16:13 +11:00
Rob Harrington
f5bacf71b7
Permissions for OrderCycleFormApplicator are determined internally
2015-03-27 16:16:13 +11:00
Rob Harrington
3817ef202c
Enterprises in simple OC create controller only load after OC initialises
2015-03-27 16:16:12 +11:00
Rob Harrington
aa170ef5f6
Order cycle simple create controller uses 'new' method on OC service to initialise
2015-03-27 16:16:12 +11:00
Rob Harrington
4d14acb64d
Don't send non-attributes of js order_cycle object to server
2015-03-27 16:16:12 +11:00
Rob Harrington
43d2eb4d22
Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs
2015-03-27 16:16:12 +11:00
Rob Harrington
887579ecb8
Use managed_by scope on Enterprise instead of user.enterprises
2015-03-27 16:16:12 +11:00
Rob Harrington
9430999540
Filtering exchange variants, for outgoing exchange variant count
2015-03-27 16:16:12 +11:00
Rob Harrington
193a061c44
Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
540ac845da
Fixing broken js spec
2015-03-27 16:16:11 +11:00
Rob Harrington
5e015f0611
Rename visibleVariants filter to visibleProductVariants
2015-03-27 16:16:11 +11:00
Rob Harrington
681dada5df
Simple OC form loads coordinator into JS
2015-03-27 16:16:11 +11:00
Rob Harrington
99bd6244ed
Filtering the list of variants visible within each exchange based on permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
63e345f819
Exchange serializer cuts down list of variants visible to the current user, based on permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
524645aff4
Replacing visible_variants_for(exchange) with more general methods for determining visbility based on the enterprises involced and the current order cyclegs
2015-03-27 16:16:11 +11:00
Rob Harrington
d115ef5f7e
Scoping old generalised order cycle helper methods to a specific order cycle
2015-03-27 16:16:10 +11:00
Rob Harrington
35b27fcfd2
Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for
2015-03-27 16:16:10 +11:00
Rob Harrington
b747f61eb1
P-OC permissions don't apply when determining which enterprises are loaded for order cycle interface
2015-03-27 16:16:10 +11:00
Rob Harrington
45f6042d3d
Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator
2015-03-27 16:16:10 +11:00
Rob Harrington
a1aa9512a8
Fixing angular order_cycle controller spec
2015-03-27 16:16:10 +11:00
Rob Harrington
7e24e6743e
enterprises_for is now order_cycle_enterprises_for, and can be passed an order_cycle or a coordinator (for new order_cycles)
2015-03-27 16:16:09 +11:00
Rob Harrington
c9f343f680
Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle)
2015-03-27 16:15:28 +11:00
Rob Harrington
d8c4e292c8
Adding method for determining variant override hubs
2015-03-27 16:09:45 +11:00
Rob Harrington
81765de7a7
Building a permission method to determine which enterprises are visible to the user for a given OC
2015-03-27 16:07:38 +11:00
Rob Harrington
4dff3fe79c
Removing unused distributable action from products api
2015-03-27 16:07:38 +11:00
Rob Harrington
1927bc55d0
Load actual variants in the exchange, wrong behaviour was implemented in previous two commits
2015-03-27 16:07:38 +11:00
Rob Harrington
e9f2e743ce
Replacing old representative template for OCs with active model serializers
2015-03-27 16:07:38 +11:00
Rob Harrington
1c09b8b76f
Limiting variants loaded into representative template to those a visible to the current user
2015-03-27 16:07:38 +11:00
Rob Harrington
00821a60cc
More specific references to enterprise id in permissions querying methods
2015-03-27 16:07:37 +11:00
Rob Harrington
252ddf9beb
Adding method to permissions library for scoping the list of visible variants in a given exchange to a particular user
2015-03-27 16:07:37 +11:00
Rob Harrington
22161bfd6e
rewriting permissions query functions in permissions library, to make scoping easier
2015-03-27 16:07:37 +11:00
Rob Harrington
6c4db7fc22
Adding permission to view outgoing exchanges to producers who have granted P-OC to the relevant outgoing hub
2015-03-27 16:07:37 +11:00
Rob Harrington
df4437ecfe
Altering permissions for exchanges, so the exchange is visible to managers of at least one of the enterprises invloved
2015-03-27 16:07:37 +11:00
Rob Harrington
2310a6a7db
Splitting out order cycle abilities from general order management abilities
2015-03-27 16:07:37 +11:00
Rob Harrington
85e4b3970c
Adding an 'involved' scope to exchanges
2015-03-27 15:56:07 +11:00
Rob Harrington
75a37e16e3
Remove elements of order cycle form that coordinators cannot edit
2015-03-27 15:56:07 +11:00
Rob Harrington
f8a9652333
Moving SASS comments to thier own lines
2015-03-27 15:56:07 +11:00
Rob Harrington
75ed259554
Conditionally show input for coordinator
...
Conflicts:
app/views/admin/order_cycles/_form.html.haml
2015-03-27 15:56:07 +11:00
Rob Harrington
a9c7e4b716
Order cycles index shows all OrderCycles I am involved in
2015-03-27 15:56:06 +11:00
Rob Harrington
0b082c964b
Restricting which enterprises can coordinate an order cycle
2015-03-27 15:51:27 +11:00
Rohan Mitchell
8037811735
Only make new enterprises as hubs when current user *owns*, not just manages a hub.
2015-03-27 14:38:21 +11:00
Rohan Mitchell
0ed1eeffd6
When registering a new enterprise, if user is signed in, owns a hub and is not making a producer, the new enterprise becomes a hub
2015-03-27 14:05:58 +11:00
Rohan Mitchell
d471368412
Spacing
2015-03-27 13:09:25 +11:00
Rohan Mitchell
09a102bd8b
When an enterprise user with a hub creates a new producer, it does not default to sells any #453
2015-03-27 12:02:20 +11:00
Rohan Mitchell
d8656a36c6
Consistency in tax calculations, remove some unneeded local vars
2015-03-25 16:31:15 +11:00
Rohan Mitchell
89d4a59e9d
Extract order total tax calculations to model
2015-03-25 16:27:29 +11:00
Rohan Mitchell
84f3097217
Calculate total tax from the tax included in all the adjustments on the order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
333a4ecf2f
Include enterprise fee tax on sales tax report
2015-03-25 16:27:29 +11:00
Rohan Mitchell
40b4edeca1
Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies.
2015-03-25 16:27:29 +11:00
Rohan Mitchell
9650692699
Calculate total tax on enterprise fees for an order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
69dc92dec1
Create factories zoned_order and taxed_product
2015-03-25 16:27:29 +11:00
Rohan Mitchell
d489e06009
Retrieve line item sales tax from included_tax rather than tax amount
2015-03-25 16:27:29 +11:00
Rohan Mitchell
daa30ed518
Retrieve the shipping tax on the order instead of calculating it from scratch
2015-03-25 16:27:29 +11:00
Rohan Mitchell
7fb8370c36
Look up shipping tax on an order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
e2a4b9a898
Fix specs that relied on the old login page which we now redirect to the new page
2015-03-25 12:11:06 +11:00
Rohan Mitchell
2a7a106ad8
Merge branch 'folklabs-currency-config'
2015-03-25 11:54:06 +11:00
Rohan Mitchell
1005a06583
Merge branch 'currency-config' of https://github.com/folklabs/openfoodnetwork into folklabs-currency-config
2015-03-25 11:39:43 +11:00
Rohan Mitchell
c36272ead6
Switch to update_column, which will not run geocoding callback of Enterprise
2015-03-25 11:37:10 +11:00
Rohan Mitchell
c6ddf36856
Make migration reversible
2015-03-25 11:35:59 +11:00
Rohan Mitchell
ebb3688add
Merge branch 'migrations' of https://github.com/folklabs/openfoodnetwork into folklabs-migrations
2015-03-25 11:30:00 +11:00
Rohan Mitchell
5da9bdc614
Merge branch 'victornava-legacy-login-fix'
2015-03-25 10:37:14 +11:00
Paul Mackay
af9a7a2ed4
#443 : Support currency configuration. Fix LOCALE variable name.
2015-03-24 15:34:45 +00:00
Paul Mackay
fcfb1aeb87
#440 : Try removing validation from update (to prevent geocoding).
2015-03-23 14:24:16 +00:00
Paul Mackay
e39d2eb113
#440 : Reset Enterprise columns before querying them.
2015-03-23 13:47:44 +00:00
summerscope
7090bb518b
Tweaking logic for alert bar to make messages more human readable for all use cases.
2015-03-20 14:24:59 +11:00
summerscope
0b1857771e
Finally got this slide animation working. stupid angular documentation!
...
ref: http://www.yearofmoo.com/2013/08/remastered-animation-in-angularjs-1-2.html
2015-03-20 13:09:45 +11:00
summerscope
938eff8482
More layout tweaks to enterprise modal template
2015-03-19 16:13:47 +11:00
summerscope
b99e94cecf
WIP on producer and product modals
2015-03-19 16:02:52 +11:00
summerscope
1f97052954
Add a min height to modals so they are not quite so stupidly small when not enough content suppied by users
2015-03-19 15:05:14 +11:00
summerscope
c76aa1d1c2
WIP on product modal
2015-03-19 14:52:09 +11:00
summerscope
cdd41ad651
change animation class
2015-03-19 14:52:00 +11:00
summerscope
3c61bf9cc4
Styling for no image available on product modal overlay
2015-03-19 14:51:41 +11:00
summerscope
8a0bbb374c
Animation WIP
2015-03-19 14:51:23 +11:00
summerscope
4e54a3c48e
Updating no image all grey, large version larger
2015-03-19 14:50:50 +11:00
Rohan Mitchell
ab9bc7b1dc
Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action
2015-03-18 12:50:25 +11:00
Rob Harrington
bfe7f49033
Show and hide search box
2015-03-18 12:01:53 +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
Rohan Mitchell
a6f0d8f69a
Show a nice error message instead of 500 error when deleting a referenced order cycle
2015-03-16 12:42:35 +11:00
Rohan Mitchell
95c09315f5
Change class delete-product -> delete-order-cycle
2015-03-16 12:42:05 +11:00
Rohan Mitchell
e38772ada0
Enterprise user can delete unreferenced order cycles
2015-03-16 12:41:06 +11:00
Rohan Mitchell
e125bcf451
Add column header for extra action column
2015-03-16 12:15:43 +11:00
Rohan Mitchell
4491d3cc73
Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix
...
Conflicts:
app/views/admin/order_cycles/_row.html.haml
spec/features/admin/order_cycles_spec.rb
2015-03-16 12:14:54 +11:00
Rob Harrington
2b32252aff
Filtering between selector lists
2015-03-15 13:25:04 +11:00
Rob Harrington
29c9f70a1c
Rename single line selectors
2015-03-15 12:29:05 +11:00
Rob Harrington
2c1ef4c8c1
Refactoring single line selectors to remove flicker
2015-03-15 12:27:40 +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
summerscope
7b1901253c
More work on filters for shopfront rewriting as compared to the rest of filter button styles
2015-03-13 17:32:33 +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
summerscope
dc1dd2e243
Changing the class .filter-box for shopfront to .filter-shopfront
...
This prevents the issue with inheritance / styling crossover
2015-03-13 16:06:46 +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
summerscope
e3bc7cf894
Styling for search alert on shopfront page
2015-03-13 15:36:06 +11:00
summerscope
e5cc9063e8
Changing the medium input styling to make it same height as taxon filters, and no animation to get big as we want the next row space for tags eventually
2015-03-13 15:35:45 +11:00
summerscope
88edaceee0
Adding a new color to brand colors - yellow light
2015-03-13 15:34:38 +11:00
summerscope
bce64a1ead
WIP product modals for shopfront
2015-03-13 15:34:11 +11:00
summerscope
c8c07ed700
Adding position fixed to modals - got lost somehow with upgrading foundation zurb
2015-03-13 12:59:26 +11:00
Rohan Mitchell
efbf2c7ffa
Display extended variant name in quick cart
2015-03-13 12:58:53 +11:00
summerscope
0258fc24f3
Moving comments to own line. New version of SASS does not like comments on same line as declarations.
2015-03-13 12:58:45 +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
Rob Harrington
274a7a3c73
Fixing up the one liner filter styling a bit
2015-03-12 09:56:06 +11:00
Victor Nava
f90f7565fb
Allow admins to delete Order Cycles
2015-03-11 18:08:09 +11:00
Victor Nava
208fa02ec0
Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page
2015-03-11 13:14:45 +11:00
Victor Nava
2c89573441
Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.
2015-03-11 11:59:25 +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
Rob Harrington
0a300d1802
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
2015-03-06 19:03:46 +11:00
Rob Harrington
12c6878cbe
Using vanilla foundation
2015-03-06 19:02:15 +11:00
Rob Harrington
4c4490a9b7
Upgrading foundation-rails and sass
2015-03-06 19:01:39 +11:00
Rob Harrington
578475a403
Filter products list on shop by active properties
2015-03-06 16:14:11 +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
Liv Galendez
266d6ef834
Fixed handling of distributors field
2015-03-06 11:55:35 +11:00
Victor Nava
3e2142c3cf
Remove the hover / pop-up over the # variants on admin order cycles index page
2015-03-06 11:33:03 +11:00
Rob Harrington
e948bf1591
Only render selector icons if the icon exists
2015-03-06 11:32:01 +11:00
Rob Harrington
06f10398da
Adding product property filter to shop page
2015-03-06 11:22:52 +11:00
Rohan Mitchell
1e18f773f5
Switch context -> describe, clarify test grammar
2015-03-06 11:15:07 +11:00
Rohan Mitchell
41792395aa
Record the tax included in per-item EnterpriseFees
2015-03-06 11:13:47 +11:00
Rohan Mitchell
98ff895f5f
Record the tax included in per-order EnterpriseFees
2015-03-06 10:38:55 +11:00
summerscope
c3c1573f54
Adding a comment
2015-03-05 23:22:31 +11:00
Rob Harrington
55b8918ea1
Updating comment
2015-03-05 18:38:01 +11:00
Rob Harrington
067b814daa
Making legacy filters work properly with filter-selector directive
2015-03-05 18:29:12 +11:00
Rob Harrington
c992937608
Moving taxon-selector directive to correct location
2015-03-05 18:28:49 +11:00
Rob Harrington
cb623b75c1
Generalising taxons-selector -> filter-selector
2015-03-05 18:15:14 +11:00
Victor Nava
3fe1fc3f67
Use dates way into the future so that test that depend on OrderSycles#recently_closed don't break.
2015-03-05 17:32:55 +11:00
Victor Nava
d6c30ae1ef
OrderCycle#recently_closed doesn't return orders that are open
2015-03-05 17:28:24 +11:00
summerscope
a0af22350d
Order conf page WIP
2015-03-05 17:21:25 +11:00
summerscope
e3b660abb9
Shopping cart page update to simplify, improve and expose fees
2015-03-05 17:21:13 +11:00
summerscope
9a86e41942
Adding more helper classes
2015-03-05 17:20:02 +11:00
Rob Harrington
e7854bcd8e
Moving single line selectors to template, making sure other users of taxons-selector still work
2015-03-05 16:38:21 +11:00
Victor Nava
a21bfc909a
Remove the suppliers column on admin order cycles index page
2015-03-05 16:12:31 +11:00
Victor Nava
1b709a3e03
Do not load Order Cycles that closed more than a month a go
2015-03-05 16:04:36 +11:00
Rob Harrington
0142f9467a
Improve display of overflow selectors
2015-03-05 16:00:53 +11:00
Rob Harrington
24b40182b5
clearAll for product page also clears any text search filter
2015-03-05 15:34:27 +11:00
Rob Harrington
ed94cf57d3
Adding the 'more' box for single-line-selectors
2015-03-05 15:10:42 +11:00
Rohan Mitchell
b5ce056d06
Fix tax calculations for determining tax included in an amount
2015-03-05 13:03:53 +11:00
Rob Harrington
5bddada013
Removing unnecessary setter
2015-03-05 12:18:34 +11:00
Rob Harrington
4afef8215a
Basic implementation of single line selectors
2015-03-05 12:12:36 +11:00
summerscope
574a215525
Order Confirmation Page WIP
2015-03-05 11:26:29 +11:00
summerscope
2cdab7af25
More label tweaks and logic tweaks to templates
2015-03-05 11:26:15 +11:00
summerscope
235bb009e8
Tweaking styling for order confirmation page
2015-03-05 11:25:57 +11:00
Victor Nava
4e1eb33ff5
Redirect users to proper login page when they type /login
2015-03-05 11:25:35 +11:00
Rohan Mitchell
dfb855bd14
Record the tax included in shipping.
2015-03-05 10:44:27 +11:00
Rohan Mitchell
9395f6c808
Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.
2015-03-05 10:44:26 +11:00
Rohan Mitchell
53fa71d1f3
Admin can set enterprise fee's tax category
2015-03-05 10:44:25 +11:00
Rohan Mitchell
61c08997a1
EnterpriseFee has a TaxCategory
2015-03-05 10:44:22 +11:00
Rohan Mitchell
dd61034908
Fix fractional cents appearing on sales tax report totals
2015-03-05 10:43:57 +11:00
Rohan Mitchell
ec22f4c09f
Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time
2015-03-05 10:43:57 +11:00
Rohan Mitchell
54894fb222
Update spec with correct tax amounts
2015-03-05 10:43:56 +11:00
Rohan Mitchell
11f59c9f59
Add spec for calculating shipping tax. Fix incorrect formula.
2015-03-05 10:43:56 +11:00
Rohan Mitchell
27a730ef6c
Add spec for sales tax report totals calcs
2015-03-05 10:43:56 +11:00
Rohan Mitchell
10e5d09416
Use ReportsHelper for currency_symbol
2015-03-05 10:43:56 +11:00
Rohan Mitchell
3b4d73760b
Break up sales tax report into methods
2015-03-05 10:43:55 +11:00
Rohan Mitchell
89199ef30a
Use map instead of each and var
2015-03-05 10:43:55 +11:00
Rohan Mitchell
67c77cea81
Tidy up haml
2015-03-05 10:43:54 +11:00
Rohan Mitchell
cc7d6cde1d
Shorter syntax
2015-03-05 10:43:54 +11:00
Rohan Mitchell
0b636c1d89
Combine spec cases for faster runtime
2015-03-05 10:43:54 +11:00
Rohan Mitchell
2b9fef6aec
Convert to Ruby 1.9 hash syntax
2015-03-05 10:43:53 +11:00
Rohan Mitchell
3aa30af199
Remove unneeded objects from spec setup
2015-03-05 10:43:53 +11:00
Rohan Mitchell
0212351d32
Tighten test
2015-03-05 10:43:53 +11:00
Rohan Mitchell
29653a5595
Fix spec infinite recursion issue
2015-03-05 10:43:52 +11:00
Matt-Yorkley
e6368af757
Update reports_spec.rb
2015-03-05 10:43:52 +11:00
Matt-Yorkley
2c80be7e9e
Update
2015-03-05 10:43:52 +11:00
Matt-Yorkley
d194e74eda
Rohan's suggested changes
2015-03-05 10:43:51 +11:00
Matt-Yorkley
3f61a5412c
Spec file attempt...
2015-03-05 10:43:51 +11:00
Matt-Yorkley
0f3723a923
Added currency symbols to sales tax report
2015-03-05 10:43:51 +11:00
Matt-Yorkley
bbca674937
Update reports_spec.rb
2015-03-05 10:43:51 +11:00
Matt-Yorkley
623882a2a1
Config option for tax rate on shipping
2015-03-05 10:43:50 +11:00
Matt-Yorkley
371f966f63
sales tax view
2015-03-05 10:43:50 +11:00
Matt-Yorkley
be55f461d0
Report: sales tax on orders
2015-03-05 10:43:50 +11:00
summerscope
e6591be55c
More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.
2015-03-04 17:34:24 +11:00
summerscope
5b6bff1691
Removing bad nasty overrides which are confusing and bad. and nasty.
2015-03-04 17:20:05 +11:00
summerscope
db2e5e7558
Add an extra class helper
2015-03-04 17:19:57 +11:00
summerscope
4867f45ee1
Add an extra style
2015-03-04 17:19:37 +11:00
summerscope
47b08269d6
Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.
2015-03-04 17:19:24 +11:00
summerscope
76f234ee4d
Order confirmation top page working on header label
2015-03-04 17:18:55 +11:00
summerscope
163035dcad
Tweaking email template to be more like order confirmation
2015-03-04 17:18:37 +11:00
Rohan Mitchell
503bd8f5dd
Merge pull request #400 from victornava/admin-account-link
...
Change admin account link to point to account page instead of edit user.
2015-03-04 16:08:26 +11:00
Victor Nava
6e800341c3
Fixes issue #362 Change admin account link to point to account page instead of edit user.
2015-03-04 16:00:46 +11:00
summerscope
b097a62c7a
WIP adding variant name logic to the email templates
2015-03-04 12:37:57 +11:00
Lynne Davis
cfa281478a
Adding ability to edit ShippingCategory.temperature_controlled from admin interface
2015-03-04 12:02:07 +11:00
summerscope
f64684dc48
Tweak responsive heading columns now that container is a bit smaller
2015-03-04 11:14:29 +11:00
summerscope
397697d17c
Tweak layout. Remove unnecessary row which was messing up the responsive layout for left column on checkout.
2015-03-04 11:13:58 +11:00
Liv Galendez
c940a34ec9
Created order_cycle_permitted_in helper
2015-03-03 21:03:01 +11:00
Liv Galendez
fc63d8719c
Used order_cycle_permitted_enterprises helper in order cycles row
2015-03-03 20:53:39 +11:00
Liv Galendez
7ba366e2a6
Added select for coordinator since there are 2 now
2015-03-03 20:46:25 +11:00
Lynne Davis
b26c46d7db
Removing default false from temp_controlled - shipping categories
2015-03-03 16:39:55 +11:00
Lynne Davis
72a568ffad
Adding not null to temp_controlled field of shipping_categories
2015-03-03 16:33:49 +11:00
Lynne Davis
3ea7ff766a
Removing additional merge conflicts
2015-03-03 16:29:17 +11:00
Lynne Davis
3d491d7b5e
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
...
Conflicts:
app/models/customer.rb
db/migrate/20150122145607_create_customers.rb
db/schema.rb
lib/open_food_network/order_cycle_management_report.rb
2015-03-03 16:21:17 +11:00
Lynne Davis
1710c8726e
Fixing conflict on attempting to rebase and pull
2015-03-03 16:13:44 +11:00
Lynne Davis
2a8ba0bf42
Fixing merge conflicts after rebase
2015-03-03 16:12:07 +11:00
Lynne Davis
3279003fd3
Updating logic on temperature_controlled lookup
2015-03-03 16:01:42 +11:00
Lynne Davis
f2a35e219e
Updating migration on customers table with extra validation
2015-03-03 16:01:42 +11:00
Lynne Davis
39c5f8febe
Updating Customer model with validations
2015-03-03 16:01:42 +11:00
Lynne Davis
87b1ab9a1a
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
2015-03-03 16:01:42 +11:00
Rob Harrington
85b8adb1aa
call to order_cycle_hub_enterprises has no arguments
2015-03-01 15:33:16 +11:00
Rob Harrington
e8818c5191
Adding a ship address to order in spec
2015-03-01 12:22:06 +11:00
Rob Harrington
c91699a11e
Using @order_cycle.coordinator instead of @coordinator
2015-02-27 17:24:37 +11:00
Rob Harrington
8d6c8791bb
Only hubs (sells any) are available for selection as outgoing enterprises
2015-02-27 17:24:36 +11:00
Rob Harrington
31054c7bf4
Split order_cycle_simple_view logic into index and form scopings
2015-02-27 17:24:36 +11:00
Rob Harrington
5563d23beb
Rename set_coordinator method to require_coordinator
2015-02-27 17:24:36 +11:00
Rob Harrington
8de6f983a2
User must set the coordinator first when creating an order cycle
2015-02-27 17:24:36 +11:00
Rob Harrington
53594b3a0f
Cannot add unconfirmed enterprises to order cycles
2015-02-27 17:24:36 +11:00
summerscope
f8619092bd
Merge branch 'order-confirmation' into master.
...
Global email tweak - light header, black logo.
This updates the order confirmation emails for better content and styling.
2015-02-27 17:16:35 +11:00
summerscope
2c2352cd4e
Final tweaks to different layout use cases for these emails.
2015-02-27 17:14:33 +11:00
summerscope
12bfb9301a
More updates dealing with pick up instructions.
2015-02-27 17:09:59 +11:00
summerscope
ba0d4c2111
More order confirmation email updates. Making language correct for hub vs user.
2015-02-27 16:55:36 +11:00
summerscope
4eee86a240
Tweak label
2015-02-27 16:09:14 +11:00
summerscope
587e4ae86d
WIP getting all the confirmation details right for collection, delivery, etc.
2015-02-27 16:08:20 +11:00
Maikel Linke
60c246f104
fixing side menu ng-show of items
2015-02-27 15:21:23 +11:00
summerscope
87842ecaf5
More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.
2015-02-27 14:00:49 +11:00
summerscope
2ba632456f
WIP email mailer updates for customer email confirmation etc.
2015-02-27 12:40:13 +11:00
Maikel Linke
3beff77164
Merge remote-tracking branch 'origin/master' into group-pages
2015-02-26 17:22:13 +11:00
Maikel Linke
69fd3f0b60
Fix link to group pages if someone enters "/groups/" instead of "/group"
2015-02-26 16:41:51 +11:00
Maikel Linke
ff4bd449a2
Setting default_country_id by application.yml
...
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.
This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
2015-02-26 16:29:46 +11:00
Maikel Linke
379b702b9b
spec: testing array of owned groups without order
2015-02-26 16:22:15 +11:00
Rohan Mitchell
fa4741eb65
Update auto-creation of E2E links: more specific and restricted link creation
2015-02-26 13:49:15 +11:00
Maikel Linke
1f7aec0c1d
group owner select box in own tab
2015-02-26 13:09:46 +11:00
summerscope
fc7abd5d02
Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab
2015-02-25 16:20:10 +11:00
summerscope
469b383781
Properties and shopfront filters with taxons WIP.
2015-02-25 16:04:32 +11:00
summerscope
15144bdddd
WIP search input on shopfront page.
2015-02-25 13:18:45 +11:00
summerscope
d43f367f30
Shopfront Properties - WIP layout work
2015-02-25 11:11:09 +11:00
summerscope
304bde3b9e
Working on the filters for shopfront properties and updates.
2015-02-25 10:46:51 +11:00
summerscope
e9fca885db
WIP layout changes for shopfront top
2015-02-25 10:46:43 +11:00
summerscope
122cf6c065
Groups index page styling for responsive use cases.
2015-02-25 10:22:33 +11:00
summerscope
9daf7e3955
Removing spans on follow icons as these show up as blank spaces when no data to fill.
2015-02-25 09:38:07 +11:00
Lynne Davis
a3df4bf026
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
2015-02-24 13:43:00 +10:00
Rohan Mitchell
fdde55f631
Add spec for ext_url filter, refactor
2015-02-23 10:06:42 +11:00
Maikel Linke
f8153c07b1
moving email from "web" to "contact" on group edit page
2015-02-22 16:20:11 +11:00
Maikel Linke
eade689070
linkToService directive to generate external links
2015-02-22 16:15:04 +11:00
Maikel Linke
a522242e7a
dealing with invalid live data in migration
2015-02-21 18:43:03 +11:00
summerscope
e05d64a0b4
WIP on groups index page. Needs work from Maikel or Rohan.
2015-02-20 16:43:36 +11:00
summerscope
985887334f
Tweak the padding between header and tabs.
2015-02-20 16:43:03 +11:00
summerscope
3aa06ee1e4
Tabs styling for groups page - making it pretty.
2015-02-20 16:14:50 +11:00
summerscope
3ab961a7e2
New mixin for gradients
2015-02-20 16:14:40 +11:00
summerscope
60b7a571c5
Tweak styling and markup for contact info in right column.
2015-02-20 15:35:07 +11:00
Rohan Mitchell
f8ca24c5cd
Index enterprise_groups address_id
2015-02-20 14:56:16 +11:00
Rohan Mitchell
f58219eb3d
Split inputs into separate partials for each fieldset
2015-02-20 11:36:30 +11:00
Rohan Mitchell
4554c0555d
Change locking to use postgres syntax, fixes 'must be first statement in transaction' error
2015-02-20 11:31:39 +11:00
Rohan Mitchell
176db78e64
Extract data fetching from views
2015-02-20 11:17:01 +11:00
Maikel Linke
98063dae60
setting default country by id in groups controller
2015-02-19 16:57:19 +11:00
Maikel Linke
c01d45e3af
Serialize move_up and move_down methods of groups
...
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
2015-02-19 16:51:58 +11:00
Maikel Linke
d5c2abdd7e
stripping "undefined" in after_find and after_save callbacks instead of overriding getters
2015-02-19 16:33:43 +11:00
Maikel Linke
a7b723af93
owner index for enterprise groups
2015-02-19 13:23:50 +11:00
Maikel Linke
6a29b830c2
commenting changes in overridden adaptivemenu.js
2015-02-19 11:35:06 +11:00
Maikel Linke
8e83c6679a
extended test of owned groups
2015-02-19 11:25:31 +11:00
Maikel Linke
a0f0b3c93b
display only activated enterprises to add to groups
2015-02-19 11:14:25 +11:00
Maikel Linke
ecd7b16ef5
revert setting default country by name in enterprise controller
2015-02-19 11:09:43 +11:00
Maikel Linke
718a5911a3
code style and cleanup
2015-02-19 10:48:39 +11:00
Maikel Linke
bbac5aa803
Using pure css for styling odd and even menu items
2015-02-19 10:22:37 +11:00
Maikel Linke
346a4e71d0
side menu partial does not require showItem defined
2015-02-19 10:17:58 +11:00
Rohan Mitchell
f83ceae5d1
Fix feature: Enterprises list is shortened when error in bulk update
2015-02-18 15:32:56 +11:00
Maikel Linke
08afcac1e5
exposing more group attributes to angular
2015-02-18 14:55:42 +11:00
Maikel Linke
9496987da6
Fix display of admin group side menu
2015-02-18 12:04:17 +11:00
Rohan Mitchell
224864a8d8
Merge pull request #385 from openfoodfoundation/empty-cart-typo
...
Fixed typo in empty cart error message
2015-02-18 10:59:17 +11:00
Liv Galendez
b9248d3e2c
Fixed typo in empty cart error message
2015-02-18 10:47:09 +11:00
Maikel Linke
903bd21577
Merge remote-tracking branch 'origin/master' into group-pages-merge
...
Conflicts:
README.markdown
db/schema.rb
2015-02-13 15:42:36 +11:00
Maikel Linke
87686848bc
make group contact fields not null
2015-02-13 15:39:44 +11:00
Rohan Mitchell
32a898b6a2
Remove unnecessary db:schema:load db:seed, these are performed by db:setup
2015-02-13 09:26:34 +11:00
Rohan Mitchell
636ed2ad0d
Make bi-directional relationships
2015-02-13 09:24:48 +11:00
Rohan Mitchell
1d61e91afd
When enterprise created, grant permission to all co-owned enterprises, not just hubs
2015-02-13 09:24:48 +11:00
Maikel Linke
6b5a1255f8
fixing a bunch of tests
2015-02-12 16:36:18 +11:00
Rob Harrington
12dc0b93aa
Scoping users correctly for realz this time
2015-02-12 16:20:46 +11:00
Rob Harrington
5503760ce3
Scoping users correctly
2015-02-12 13:45:25 +11:00
Rob Harrington
9fa5a9e766
Fix before_filter load order for enterprises#shop
2015-02-12 11:34:58 +11:00
Rob Harrington
a62f48441d
Restrict ability to change managers of enterprises using update action
2015-02-12 11:34:58 +11:00
Rob Harrington
5c09ebf138
Adding manager managment to enterprise edit form
2015-02-12 11:34:58 +11:00
Rob Harrington
ee5ab22501
Moving interface for changing owner to new 'Users' tab
2015-02-12 11:34:58 +11:00
Rob Harrington
ad1f837c44
Admin users can access all users through known_users
2015-02-12 11:34:58 +11:00
Rob Harrington
dcb24cf06c
Controller method to allow enterprise users to search for other users which share management of their enterprises
2015-02-12 11:34:58 +11:00
Rob Harrington
b73619d168
Adding known_users method to Spree::User
2015-02-12 11:34:58 +11:00
Rob Harrington
dde1a27d3a
Adding ability to search for known users
2015-02-12 11:34:57 +11:00
Maikel Linke
57e838898f
Update documentation of database setup
...
db:setup is doing db:schema and db:seed already
2015-02-12 11:05:21 +11:00
Maikel Linke
773a5480e9
Activate search input for groups again
2015-02-12 10:44:20 +11:00
Maikel Linke
0fdf313424
Fixing img display of producers if no logo present
2015-02-12 10:31:13 +11:00
Rohan Mitchell
46aee6f77c
Upgrade Rails to 3.2.21
2015-02-11 14:30:49 +11:00
Rohan Mitchell
ca558a4ecc
Fix admin tab to check correct permission
2015-02-11 11:55:48 +11:00
Maikel Linke
edcef02017
link_to_service helper deals with nil
2015-02-07 19:40:59 +11:00
Maikel Linke
211e9c33a7
Fixing link to group website
2015-02-07 19:31:16 +11:00
Maikel Linke
2293623d2c
Display default group logo if no logo was uploaded
2015-02-07 19:24:36 +11:00
Maikel Linke
9e51b19f98
right mapping of contributer's names in git
2015-02-07 18:12:34 +11:00
summerscope
90ba1d2198
Updating the groups header to behave better with a square thumbnail logo image.
...
Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)
2015-02-06 17:15:40 +11:00
summerscope
78877f591b
Fix template so website links work to push to external pages
2015-02-06 13:58:04 +11:00
summerscope
f292be8c92
Making styling of underlines for contact same color as HRs, bit lighter and brigher
2015-02-06 13:50:34 +11:00
summerscope
755adf4287
Index page stop-gap improvements until we get more variables to display in this list. Commented out search field not working
2015-02-06 13:41:58 +11:00
summerscope
9547f91f46
Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue
2015-02-06 13:31:33 +11:00
Maikel Linke
30601b9203
tidy up group contact with helpers
2015-02-05 20:20:28 +11:00
Maikel Linke
504a053693
link_to_ext helper for group pages
2015-02-05 17:21:41 +11:00
summerscope
148333467f
Groups styling and markup - finishing up contact info partial etc
2015-02-05 17:14:56 +11:00
Maikel Linke
242fb49276
checking for undefined phone number in model
2015-02-05 16:17:29 +11:00
Maikel Linke
37dbd376e9
fixing indent
2015-02-05 15:54:53 +11:00
Maikel Linke
b641de6ec9
Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages
...
Conflicts:
app/views/groups/show.html.haml
2015-02-05 15:52:00 +11:00
Maikel Linke
313843d798
moving contact partial and giving example code
2015-02-05 15:50:33 +11:00
summerscope
1b51ea0e3a
Groups logo default image
2015-02-05 15:42:24 +11:00
summerscope
f2e3d298fa
More styling for responsive sizes groups header
2015-02-05 15:17:50 +11:00
summerscope
e19aaf6be8
Styling tabs for responsive design, improving groups page layout
2015-02-05 14:53:09 +11:00
summerscope
28b2dd40dd
Kill the pad top for Producers tab content too
2015-02-05 12:31:38 +11:00
summerscope
c9bbe80738
Remove padding class to producers tab content
2015-02-05 12:28:24 +11:00
Maikel Linke
0f7b880409
restoring groups hubs tab
2015-02-05 12:23:08 +11:00
Maikel Linke
78a8f8c1bb
Merge remote-tracking branch 'origin/group-pages' into group-pages
2015-02-05 12:07:52 +11:00
summerscope
b1b1aa5b1e
Groups page WIP with mikael and rob
2015-02-05 12:07:11 +11:00
Maikel Linke
a7c2a73fa8
make groups editable by group owners
2015-02-05 12:05:39 +11:00
Rohan Mitchell
fce7714994
Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs
2015-02-04 11:20:08 +11:00
Rohan Mitchell
7ca9670073
Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant
2015-02-04 11:09:48 +11:00
Rohan Mitchell
22f6ece83f
When fetching products for variant overrides admin, fetch all overridable products
2015-02-04 10:16:34 +11:00
Rohan Mitchell
a7bb04b890
Find all producers for which we can create variant overrides
2015-02-04 10:13:35 +11:00
Rohan Mitchell
4c586d1b7e
Fetching enterprises for which hubs can create variant overrides: allow all hubs that we can add to order cycle, find producers via create_variant_overrides permission
2015-02-04 10:04:57 +11:00
Rohan Mitchell
7ea143d19a
Provide AR relation instead of array in stub
2015-02-04 09:42:04 +11:00
Rohan Mitchell
25189d190b
Shift method
2015-02-04 09:30:01 +11:00
Maikel Linke
91b35d068c
Adding owner to groups
...
Groups have owners and users own groups. The owners are displayed and
changable on the group's page by admin users.
2015-02-02 15:58:34 +11:00
Maikel Linke
8d9f8beff3
creating facebook url
2015-02-02 10:33:13 +11:00
Rohan Mitchell
c0a7d22a50
Add permitted_by scope to EnterpriseRelationship
2015-01-30 16:36:45 +11:00
Rohan Mitchell
fafbfe8735
Simplify, simplify
2015-01-30 15:56:10 +11:00
summerscope
6fddb491db
New partial for groups contact
2015-01-30 14:07:55 +11:00
summerscope
5ea3733c8a
Groups page styling WIP
2015-01-30 14:07:38 +11:00
Rohan Mitchell
7ac888ae00
Admin can grant create_variant_overrides permission
2015-01-30 11:56:05 +11:00
Rohan Mitchell
ed4d78bca8
Decorators can't be in same file name as original file, otherwise the original file is ignored
2015-01-30 11:23:49 +11:00
summerscope
d99a54accf
WIP groups individual page template markup - still needs alot of love.
2015-01-29 17:43:36 +11:00
summerscope
fd363ff6c2
WIP Groups individual page styling
2015-01-29 17:43:10 +11:00
summerscope
fcd9653a79
Add padding to groups homepage
2015-01-29 15:52:40 +11:00
summerscope
8e42f29bde
WIP groups page styling and markup updates
2015-01-29 15:52:20 +11:00
Rohan Mitchell
a25bf32156
Show extended variant name/unit info for admin variant overrides
2015-01-29 15:15:28 +11:00
Rohan Mitchell
7a5c56cbca
Do not show out of stock lines on order confirmation page
2015-01-29 13:19:04 +11:00
Rob Harrington
cbae7dcc8e
Adding visible to user and enterprises report, and sorting by confirmation date
2015-01-29 10:46:44 +11:00
Rob Harrington
9163b0c1ad
Adding missing equals sign to test for equality in permalink migration
2015-01-28 11:37:02 +11:00
Rob Harrington
fd9f65f1b6
Merge branch 'shopfront-filters' into shop-url
2015-01-28 10:57:11 +11:00
Rob Harrington
713999c1d8
Merge branch 'master' into shop-url
2015-01-28 10:53:42 +11:00
Rob Harrington
21db56ce6c
Rollback angularjs upgrade
2015-01-28 08:41:14 +11:00
Rob Harrington
adbe127e76
Revert "Update bindonce"
...
This reverts commit 48dc85cfc2 .
2015-01-25 14:08:29 +11:00
Lynne Davis
3c4ad4121f
LD adding whitespace to get my master version back in line with origin
2015-01-22 14:00:48 +00:00
Lynne Davis
8e8f38e484
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-22 12:01:20 +00:00
Maikel Linke
d93a8b6428
Enterprise and Group controllers use default country instead of default country id
2015-01-22 16:22:34 +11:00
Maikel Linke
7a48d7fe22
Updating feature spec for groups
2015-01-22 16:04:46 +11:00
Rob Harrington
b429be707c
Split out payment and shipping methods from admin enterprises controller as services
2015-01-22 12:19:41 +11:00
Maikel Linke
87b092fdf7
Adding addresses to existing groups and make them changable
2015-01-22 12:10:54 +11:00
Rob Harrington
4829e59663
Fixing checkout controller spec
2015-01-22 10:46:31 +11:00
Rob Harrington
d12fdd23fb
Fixing navcheck callback
2015-01-22 10:46:01 +11:00
Rob Harrington
b0a29801b6
Making spec controller product request spec a little bit more robust
2015-01-22 10:20:03 +11:00
Rob Harrington
6ebd58b67d
Updating home spec to reflect new shopfront url
2015-01-22 10:19:47 +11:00
Rob Harrington
0791cc3c2a
Making sure that we have a .path() in HashNavigation
2015-01-22 10:19:47 +11:00
Rob Harrington
76acbb6159
Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)
2015-01-22 10:19:47 +11:00
Rob Harrington
d7ea81e821
Prevent default form action from submitting ordercycle forms
2015-01-22 10:19:47 +11:00
Rob Harrington
9245af6a8f
Producer properties routes use enterprise permalink
2015-01-22 10:19:47 +11:00
Rob Harrington
36430d3bad
Enterprise permalink generator handles blank permalink case
2015-01-22 10:19:46 +11:00
Rob Harrington
7520552fd7
Removing spec for testing empty permalink, since we now force permalink to be created when empty
2015-01-22 10:19:46 +11:00
Rob Harrington
6991e5e6b1
Finally got all callbacks available to all action that need them
2015-01-22 10:19:46 +11:00
Rob Harrington
42d6695264
Fix permalink migration to handle blank auto-generated permalinks and fixed down migration
2015-01-22 10:19:45 +11:00
Rob Harrington
4d26b3d648
Make unused cart_controller happy
2015-01-22 10:19:45 +11:00
Rob Harrington
177181cd75
CurrentUser always returns a factory
2015-01-22 10:19:45 +11:00
Rob Harrington
4baa205cf9
before_filters for enterprise controller are run in the correct order, and put inside the shop action
2015-01-22 10:19:45 +11:00
Rob Harrington
60313f7a6a
Replace delete with parameterize
2015-01-22 10:19:45 +11:00
Rob Harrington
3e5ea3fe63
Adding automatic permalink generation on enterprise creation
2015-01-22 10:19:45 +11:00
Rob Harrington
b98c01b280
Updating permalink controller specs
2015-01-22 10:19:44 +11:00
Rob Harrington
ff624e83eb
Require distributor in enterprise controller, so that everything actually works
2015-01-22 10:19:44 +11:00
Rob Harrington
48dc85cfc2
Update bindonce
2015-01-22 10:19:44 +11:00
Rob Harrington
a0990c107f
Moving navigation check to controller
2015-01-22 10:19:44 +11:00
Rob Harrington
585c061fb0
Upgrade angularjs
2015-01-22 10:19:44 +11:00
Rob Harrington
83726eba63
Refactoring permalink checker to handle multiple requests elegantly
2015-01-22 10:19:43 +11:00
Rob Harrington
7ad9fdf0be
Cleaning permalink before checking
2015-01-22 10:19:43 +11:00
Rob Harrington
6b10a4a775
Restoring enterprise permalinks when they cause errors
2015-01-22 10:19:43 +11:00
Rob Harrington
4088bdc236
Clean up permalink checker
2015-01-22 10:19:43 +11:00
Rob Harrington
9b78963d5a
Adding a javascript interface for checking permalinks and user input on enterprise console
2015-01-22 10:19:43 +11:00
Rob Harrington
3ec3441cfa
Replacing all uses of the old enterprise shop url helper
2015-01-22 10:19:43 +11:00
Rob Harrington
39889390ef
Altering shop page routing so that shop url is copy-and-pastable
2015-01-22 10:19:42 +11:00
Rob Harrington
c3659612ed
enterprise routes use permalink
2015-01-22 10:19:42 +11:00
Rob Harrington
7a6cd98646
Fixing failing spec, missing permalink
2015-01-22 10:19:42 +11:00
Rob Harrington
9286c82b43
Removing obsolete methods
2015-01-22 10:19:42 +11:00
Rob Harrington
c330e49a7f
Moving permalink check action to enterprise controller
2015-01-22 10:19:42 +11:00
Rob Harrington
e2268e53bb
Adding action to check uniquness of enterprise permalink against existing routes
2015-01-22 10:19:41 +11:00
Rob Harrington
9f0aeb5adf
Adding unique permalink to enterprises
2015-01-22 10:19:41 +11:00
Maikel Linke
0d9a0919e5
show contact a group's contact footer
2015-01-21 16:39:41 +11:00
Maikel Linke
c1aa2f9b33
Display contact information in the front end
2015-01-21 16:12:28 +11:00
Maikel Linke
650e35c13e
Adding contact information to groups backend
2015-01-21 16:11:55 +11:00
Maikel Linke
71de15b3e4
Contact address for enterprise group
2015-01-21 12:32:07 +11:00
Rohan Mitchell
41e42c78c4
Update spec link name
2015-01-16 17:25:38 +11:00
summerscope
1753432f36
Adding new loading animation to replace ugly and large gif
2015-01-16 17:06:40 +11:00
summerscope
0f8809abfc
Merge branch 'master' into shopfront-filters
2015-01-16 16:12:34 +11:00
Rob Harrington
1d80bee595
Cart item total reflects total number of items in the cart
2015-01-16 16:06:51 +11:00
summerscope
d04e843315
kill unused line
2015-01-16 16:01:17 +11:00
summerscope
c0eb902eef
Turn off text shadow for buttons on popover for top nav
2015-01-16 16:00:18 +11:00
Rob Harrington
2c307f09c3
Changing edit cart button to link
2015-01-16 15:47:56 +11:00
summerscope
23fc428d95
Move spinner icon to left of text
2015-01-16 14:57:30 +11:00
summerscope
3bd77c74a5
Improve logic on shopping cart button to add meaningful labels for various states
2015-01-16 14:57:09 +11:00
summerscope
8334ff736b
Styling for shopping cart buttons and spinner
2015-01-16 13:27:34 +11:00
summerscope
51687b5c2c
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
2015-01-16 13:27:16 +11:00
summerscope
21108b34b6
Add new animation for spinning
2015-01-16 13:26:40 +11:00
summerscope
2a21889216
Remove border on product thumbnail to clean up UI
2015-01-16 13:06:30 +11:00
summerscope
b451b94fd1
Improving styling on large thumbnail view of product images
2015-01-16 13:06:02 +11:00
summerscope
d2d3a577ea
Merging master into this branch to make it easy to pull for staging push
2015-01-15 17:38:35 +11:00
Rob Harrington
b3e67fa164
Take two on disabled logic
2015-01-15 17:34:04 +11:00
Rob Harrington
ac34da4f24
Altering logic around disabled state for 'Your Shopping Cart' button
2015-01-15 17:19:48 +11:00
summerscope
d2277999cc
Undo change of logic on disabled state on Shopping cart button
2015-01-15 17:13:10 +11:00
summerscope
cdd6c2daf2
Styling product summary row to allow for hiding product thumb at a larger break point
2015-01-15 16:46:55 +11:00
summerscope
4a881a5aa5
Turn off product thumb at a larger break point
2015-01-15 16:46:18 +11:00
summerscope
d5d218c450
Make taxon flag smaller for smallest device breakpoint
2015-01-15 16:45:54 +11:00
summerscope
f8622be21d
Adding in new color variable
2015-01-15 16:45:29 +11:00
summerscope
676e7cb4d6
Make taxon flag 2 cols for small devices
2015-01-15 16:45:09 +11:00
summerscope
1dfbc88813
Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around
2015-01-15 16:16:01 +11:00
summerscope
9db1c4c708
Adding in new color variable
2015-01-15 16:15:23 +11:00
Rohan Mitchell
25a734b208
When creating enterprise, establish relationships with the owner's hubs
2015-01-15 16:08:03 +11:00
summerscope
47a8731b8e
Styling for price column to distinguish between product added vs null
2015-01-15 16:01:49 +11:00
summerscope
932604bd69
Add in logic to style price column differently if nul vs has value
2015-01-15 16:01:00 +11:00
summerscope
4d7871a0bb
New grey color variable
2015-01-15 16:00:21 +11:00
summerscope
51c8891fac
Add animation to product title hover
2015-01-15 15:24:01 +11:00
summerscope
9b258e075b
Add styling and animation to img thumbnail
2015-01-15 15:23:36 +11:00
summerscope
891a9b06a8
Add expand icon on top of image thumbnail
2015-01-15 15:23:10 +11:00
Maikel Linke
4dc0701213
Side menu for enterprise group page
2015-01-15 15:04:21 +11:00
summerscope
b5879d51ac
Merging master into shopfront-filters branch
2015-01-15 14:15:25 +11:00
Rohan Mitchell
dcc04ea538
On enterprise edit page, do not show side menu links we don't have permission to
2015-01-15 13:43:39 +11:00
Rohan Mitchell
83754a01ef
Make side menu item visibility declarative
2015-01-15 13:43:39 +11:00
Rohan Mitchell
2d82f76a43
Fix changed var in ability spec
2015-01-15 13:43:39 +11:00
Rohan Mitchell
d5437e1508
edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise
2015-01-15 13:43:39 +11:00
Rohan Mitchell
f0bd9c1065
Fix failing specs due to addition of another enterprise
2015-01-15 13:43:39 +11:00
Rohan Mitchell
642de2f65f
Only show delete enterprise link when user has permission
2015-01-15 13:43:39 +11:00
Rohan Mitchell
f6e9c9494c
Enterprise user can edit profiles it has permission to
2015-01-15 13:43:39 +11:00
Rohan Mitchell
90ad2e2b7d
Allow enterprises with 'edit profile' permission to edit enterprises
2015-01-15 13:43:39 +11:00
Rohan Mitchell
cfb69ae7d2
Add Permissions#editable_enterprises
2015-01-15 13:43:38 +11:00
Rohan Mitchell
a93a824b83
Admin can grant permission for an enterprise to edit the profile of another
2015-01-15 13:43:38 +11:00
Rohan Mitchell
2170c7ede1
Fix broken JS spec
2015-01-15 13:43:38 +11:00
Rob Harrington
06cf914119
Hopefully resolving order populator strangeness related to concurrency by ensuring a fresh list of line items
2015-01-15 12:10:05 +11:00
Maikel Linke
3e5dfda324
Removing old link to enterprise groups from configuration menu
2015-01-15 10:53:11 +11:00
Maikel Linke
13cbbcef40
Admin Tab Menu: converting .rb to .html.haml.deface
...
Plus a new menu item for enterprise groups.
2015-01-15 10:26:27 +11:00
Maikel Linke
949808e839
Customising AdaptiveMenu for the admin tab panel
...
The AdaptiveMenu was design for a menu filling the screen width. Our
menu is in a skeleton structure. The new file overwrites the spree
version and takes the container width as reference.
2015-01-14 18:03:08 +11:00
Maikel Linke
02a276b9c9
Producer and hub lists with search
...
Fixing map display as well.
2015-01-14 15:18:46 +11:00
Maikel Linke
9f1a773a58
MapController: copy default config instead of referencing
...
Copying makes it possible to have multiple independent maps.
2015-01-14 14:34:31 +11:00
Maikel Linke
0e510998a4
Handling missing options in shipping filter call
2015-01-14 14:33:37 +11:00
Rohan Mitchell
307cc313df
Stub scope_to_hub in spec that wasn't expecting it
2015-01-13 11:46:41 +11:00
Rohan Mitchell
0431e0048c
Merge branch 'master' into variant-overrides-frontend
...
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
Rohan Mitchell
20bde803c8
Display overridden prices when products are in the cart
2015-01-12 14:58:35 +11:00
Rohan Mitchell
6b43354386
Restructure spec
2015-01-12 14:37:43 +11:00
Rohan Mitchell
494bb1f3b4
Fix auto-reload nerfing scope_xx_to_hub
2015-01-12 14:24:15 +11:00
Rohan Mitchell
d52b6b34e3
Spec: do not subtract stock from overrides that do not override count_on_hand
2015-01-12 11:33:53 +11:00
Rohan Mitchell
4583e29ae3
When order is placed, subtract stock from variant override
2015-01-12 11:23:53 +11:00
Rohan Mitchell
a4d4622521
Add VariantOverride.decrement_stock
2015-01-12 10:39:23 +11:00
Rohan Mitchell
20f650b472
Add VariantOverride.stock_overriden?
2015-01-12 09:32:02 +11:00
Rohan Mitchell
e013e1fe00
Don't show rspec profile by default
2015-01-09 15:30:49 +11:00
Rohan Mitchell
d40ffeef52
Remove old sidebar
2015-01-09 13:10:17 +11:00
Rohan Mitchell
6200390369
Merge branch 'lin-d-hop-add_shipping_category'
2015-01-09 12:49:09 +11:00
Rohan Mitchell
e9f32f5329
Spec that shipping category can be set when creating new products
2015-01-09 12:46:36 +11:00
Rohan Mitchell
27bc845b0b
Add correct markup for tax category required asterisk
2015-01-09 12:45:35 +11:00
Rohan Mitchell
22cb8b7a71
Two-space indentation, change 'Shipping categories' to 'Shipping category'
2015-01-09 12:33:26 +11:00
Rohan Mitchell
c6db1d440c
Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category
...
Conflicts:
app/overrides/spree/admin/products/new/replace_form.html.haml.deface
app/views/spree/order_mailer/confirm_email.text.haml
2015-01-09 12:30:19 +11:00
Rohan Mitchell
bc448e5156
Merge branch 'lin-d-hop-report_download_namechange'
2015-01-09 11:51:46 +11:00
Rohan Mitchell
6a42f62eb2
Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report
2015-01-09 11:49:59 +11:00
Rohan Mitchell
8db09d9590
Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-09 11:48:23 +11:00
Rohan Mitchell
7e55262ce9
Extract most everything to private methods - neatly groups concerns together
2015-01-09 11:28:39 +11:00
Rohan Mitchell
bbc887a692
Test the exact value, not the truncated value
2015-01-09 11:26:25 +11:00
Rohan Mitchell
6f36c0463c
Separate data preparation from test conditions
2015-01-09 11:26:25 +11:00
Rohan Mitchell
592ac7856a
Variable naming
2015-01-09 11:26:25 +11:00
Rohan Mitchell
261dea37e9
Spec formatting
2015-01-09 11:26:25 +11:00
Rohan Mitchell
80c507cc66
Formatting
2015-01-09 11:26:25 +11:00
Lynne Davis
1ad13f0359
Cleanup of git to remove unnecessary commits from pull request
2015-01-09 11:26:24 +11:00
Rohan Mitchell
532041c07b
Use Fuubar formatter for rspec - displays fails as they happen
2015-01-08 12:12:15 +11:00
Rohan Mitchell
05bd0c4168
Merge branch 'Matt-Yorkley-reports_2'
2015-01-08 10:50:27 +11:00
Rohan Mitchell
51b0d7e0eb
Move private method to helper
2015-01-08 10:48:02 +11:00
Rohan Mitchell
d2e0d4f44a
Fix grammar
2015-01-08 10:39:51 +11:00
Rohan Mitchell
ab26902e4e
Move money decorator to lib dir, as it's a decorator for a lib class, not a model
2015-01-08 10:39:14 +11:00
Rohan Mitchell
6adb4194c2
Extract date range form to partial
2015-01-08 10:31:51 +11:00
Rohan Mitchell
b6f29c778e
Use haml syntax for defining divs
2015-01-08 10:23:37 +11:00
Rohan Mitchell
4839c00d62
Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax
2015-01-08 10:12:32 +11:00
Rohan Mitchell
a438216189
Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-08 10:08:12 +11:00
Rohan Mitchell
29f9b3bbd7
Merge branch 'Matt-Yorkley-tax_cat_dropdown'
2015-01-08 09:51:27 +11:00
Rohan Mitchell
ac59665e3c
Test validations without creating models in database
2015-01-08 09:48:33 +11:00
Rohan Mitchell
e4efda2f96
Move model spec into validations block
2015-01-08 09:37:35 +11:00
Rohan Mitchell
a9b91bc52a
Tighten spec: setting tax category should succeed
2015-01-08 09:35:18 +11:00
Rohan Mitchell
f90ee33c89
Use the tax category factory provided by Spree
2015-01-08 09:27:29 +11:00
Rohan Mitchell
087ccb52f9
Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown
2015-01-08 09:09:20 +11:00
Rohan Mitchell
4bf8716786
Extract complete_checkout to method
2015-01-07 16:29:15 +11:00
Rohan Mitchell
c0030ddb13
use_short_wait can now take a flexible wait time
2015-01-07 16:28:03 +11:00
Rohan Mitchell
370133b875
Fix minor spec issues
2015-01-07 16:06:23 +11:00
Maikel Linke
3b9657eb17
show map of a group's enterprises
2015-01-07 12:00:55 +11:00
Maikel Linke
9956b967f0
Fixing link to group's page
2015-01-07 10:27:08 +11:00
Maikel Linke
9310bc902a
first draft of group page, a lot of TODOs
2015-01-06 22:39:15 +11:00
Maikel Linke
9798b05a24
TabsCtrl can show tabs that don't toggle
...
toggle: tabs show on first click and hide on second click
select: tabs show on every click, one tab is always active
2015-01-06 22:39:15 +11:00
Maikel Linke
586753015b
Reducing the groups page to a oneline list of groups
2015-01-06 22:39:15 +11:00
summerscope
6863dd75ef
Restyling button for price breakdown to make it more clear that users press again to close the pop over
2014-12-19 17:05:13 +11:00
summerscope
fafdb29fcb
Regenerated icon font, smaller file size and updated graph icon
2014-12-19 17:04:26 +11:00
Rohan Mitchell
85882a73ff
Merge branch 'lin-d-hop-266reportsbranch'
2014-12-19 16:51:38 +11:00
Rohan Mitchell
2bad590ef4
Order confirmation and order objects use overridden prices
2014-12-19 16:51:11 +11:00
Rohan Mitchell
c3995ee4d5
Checkout shows overridden prices
2014-12-19 16:51:11 +11:00
Rohan Mitchell
94684e9963
Show overridden price in shopping cart
2014-12-19 16:51:11 +11:00
Rohan Mitchell
1e1a070b2b
Scope Variant#price_in
2014-12-19 16:51:10 +11:00
Rob Harrington
6f95fa8546
Merge remote-tracking branch 'origin/shopfront-filters'
2014-12-19 15:40:01 +11:00
Rob Harrington
170b14d0f5
Tightening up expectations in shop controller spec
2014-12-19 15:39:13 +11:00
summerscope
d50f8dcd01
Tweak styling shopfront page to allow for new icons and hover state
2014-12-19 14:53:46 +11:00
summerscope
813ef463a2
Tweak markup shopfront page to add icon
2014-12-19 14:53:25 +11:00
Rob Harrington
a810fc88ac
Dedicated new enterprise form
2014-12-19 14:05:24 +11:00
Rob Harrington
24cf3dee74
Hiding Shop Preferences in enterprise form
2014-12-19 14:05:24 +11:00
Rob Harrington
21e4f40616
Implementing primary taxon ordering on the shopfront
2014-12-19 14:05:23 +11:00
Rob Harrington
0fa289a443
Changing shopfront message into an alert box
2014-12-19 14:04:02 +11:00
Rob Harrington
fcb14f32d2
Validating user input for shopfront taxon order
2014-12-19 14:04:02 +11:00
Rob Harrington
f145a7ed65
Moving taxons into its own module, adding preferred shopfront taxon order to enterprise
2014-12-19 14:04:02 +11:00
Rob Harrington
a38e27e504
Adapting taxon autocompleter to allow multiple selection of taxons
2014-12-19 14:04:02 +11:00
Rob Harrington
4b353fa27b
Ammending comments to make slightly more clear
2014-12-19 14:04:01 +11:00
Rob Harrington
9f086facdb
Hiding link to shopfront for non-distributors
2014-12-19 14:04:01 +11:00
Rob Harrington
2efd905227
Fixing specs to work with text-angular
2014-12-19 14:04:01 +11:00
Rob Harrington
c5bf228cb9
Removing hashes from side menu links
2014-12-19 14:04:01 +11:00
Rob Harrington
b18163bfaf
Remove separate long description injection, use full enterprise serializer instead
2014-12-19 14:04:01 +11:00
Rob Harrington
3fa1832e7b
Adding shop closed message preference
2014-12-19 14:04:01 +11:00
Rob Harrington
d5df73c6a2
Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular
2014-12-19 14:04:01 +11:00
Rob Harrington
5a24f2c0e2
WIP: adding shopfront message to shop
2014-12-19 14:04:00 +11:00
Rob Harrington
435bc177f8
Hiding side menu elements by filtering rather than by making invisible
2014-12-19 14:04:00 +11:00
Rob Harrington
a489aa7ad9
Fixing enterprise feature spec, adding first shop preference
2014-12-19 14:04:00 +11:00
Rob Harrington
88d49148d4
Adding border to text-angular form element
2014-12-19 14:04:00 +11:00
Rob Harrington
33d4f03a99
Adding shop preferences pane, fiddling with icons
2014-12-19 14:04:00 +11:00
Rob Harrington
612c8a95b2
Adding icons to enterprise edit side menu
2014-12-19 14:04:00 +11:00
Rob Harrington
abdcdea1a2
Adding payment methods partial to new enterprirse edit screen
2014-12-19 14:04:00 +11:00
Rob Harrington
412b431f36
Fixing up tbody positions
2014-12-19 14:03:59 +11:00
Rob Harrington
25e608d9fb
Adding shipping methods partial to redone enterprise form
2014-12-19 14:03:59 +11:00
Rob Harrington
bc32a053f7
Adding global styling class for aligning text to the right
2014-12-19 14:03:59 +11:00
Rob Harrington
0ea1adfdff
Adding a partial for enterprise fees to enterprise form
2014-12-19 14:03:59 +11:00
Rob Harrington
468e83cef7
Adding global centering css class
2014-12-19 14:03:59 +11:00
Rob Harrington
76acd706ea
Adding ability to show and hide menu items
2014-12-19 14:03:59 +11:00
Rob Harrington
eb2a6f0ef5
Splitting contact and social into two separate partials
2014-12-19 14:03:59 +11:00
Rob Harrington
b10d623f26
Rearrange columns for action buttons on enterprise form
2014-12-19 14:03:58 +11:00
Rob Harrington
f86d4a1996
Pulling headings out of enterprise form partials, displaying each conditionally
2014-12-19 14:03:24 +11:00
Rob Harrington
d8349bc037
menu refers to SideMenu object
2014-12-19 13:52:02 +11:00
Rob Harrington
39ca0ce3dc
WIP: Adding a side_menu to the enterprise form
2014-12-19 13:52:01 +11:00
Rob Harrington
b0c86f83ee
Splitting enterprise edit page into partials
2014-12-19 13:52:01 +11:00
summerscope
b944030994
Add some logic for small screen layout
2014-12-19 13:11:35 +11:00
summerscope
e9cb7f9565
Styling for clear filters row
2014-12-19 13:02:17 +11:00
summerscope
f36c881f52
Add clear filters feature to Producers page
2014-12-19 13:02:07 +11:00
summerscope
e8c5af004f
Add another class so we can see which row is clear filters
2014-12-19 13:01:49 +11:00
summerscope
b55bced488
Put show hide animation back in for clear button
2014-12-19 12:53:48 +11:00
summerscope
ebe2d99299
Change markup because the boolean variable now works correctly
2014-12-19 12:53:26 +11:00
summerscope
515348a8fb
Change the filtersActive variable for this page only
2014-12-19 12:52:57 +11:00
summerscope
08d37b955a
Refactoring filter feature for shopfront page - show by default, hide on click. WIP.
2014-12-19 12:22:04 +11:00
Rohan Mitchell
72118f4e2e
Fix syntax error, spec for removed column
2014-12-19 10:01:46 +11:00
Rohan Mitchell
e9f04c3c15
Clean up whitespace
2014-12-19 10:01:21 +11:00
Rohan Mitchell
6e0576235d
Use create\! instead of build - more concise, raises exception on error
2014-12-19 09:51:32 +11:00
Rohan Mitchell
27d646c0e8
Tweak indentation, remove some blank lines
2014-12-19 09:51:32 +11:00
Rohan Mitchell
0151ecbb32
Add additional rows to payment method selection
2014-12-19 09:51:32 +11:00
Rohan Mitchell
d548515684
Remove unused header column
2014-12-19 09:51:13 +11:00
Rohan Mitchell
343af1f1e0
Rename report_shipping_options to report_shipping_method_options for symmetry with report_payment_method_options
2014-12-19 09:51:07 +11:00
Rohan Mitchell
3b58d99abc
Fix spec failure
2014-12-19 09:51:02 +11:00
Rohan Mitchell
4a30f27b3d
Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
spec/models/spree/order_spec.rb
2014-12-19 09:38:02 +11:00
Rohan Mitchell
c4b45bdbbf
Fix line items returning prices with fractional cents
2014-12-18 16:24:59 +11:00
Rohan Mitchell
b0f5d0170c
Spec that overridden price with fees appears in quick cart
2014-12-18 13:32:28 +11:00
Rohan Mitchell
5fcb2982fa
Fees are calculated correctly for items with variant overrides
2014-12-18 11:53:17 +11:00
Rohan Mitchell
ead84aa9ff
Add ids to product listing products and variants
2014-12-18 11:00:45 +11:00
Rohan Mitchell
1d3800696e
Variant overrides can override stock levels
2014-12-18 10:46:47 +11:00
Rohan Mitchell
f5ee9ba2f3
VariantOverride looks up count_on_hand
2014-12-18 10:21:07 +11:00
Rohan Mitchell
e6eecd3ae2
Replace proxies with modules
2014-12-18 10:20:31 +11:00
Rohan Mitchell
0832a8f63d
Viewing products shows overridden prices
2014-12-17 16:00:25 +11:00
Rohan Mitchell
23c7715929
Cosmetic change
2014-12-17 14:03:54 +11:00
Rohan Mitchell
2ea7bdbec6
Move controller spec to serializer spec
2014-12-17 14:01:59 +11:00
Rohan Mitchell
6c300431d2
Move Product#variants_for to Variant.for_distribution scope
2014-12-17 13:42:30 +11:00
Rohan Mitchell
91c500417b
Swap param order
2014-12-17 08:55:27 +11:00
Lynne Davis
7e49bd634e
Updated the specs with Rohans suggestions
2014-12-12 18:23:43 +00:00
Lynne Davis
eeae72352b
Renamed methods and vars to better fit naming conventions
2014-12-12 10:11:33 +00:00
Rob Harrington
66669e66ab
Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts
2014-12-12 15:43:05 +11:00
Rohan Mitchell
99dce6e8d6
Merge branch 'enterprise-form-confirmation'
2014-12-12 15:29:59 +11:00
Rohan Mitchell
27b0052e2b
Merge branch 'product-category-required'
2014-12-12 15:29:31 +11:00
Rohan Mitchell
0b3dfa7278
Merge branch 'product-reports-without-deleted'
2014-12-12 15:29:03 +11:00
Rohan Mitchell
84b607433c
Creating and then updating the new override updates the same override instead of creating a duplicate
2014-12-12 13:33:14 +11:00
Rohan Mitchell
31823f2dbd
Setting both values to blank deletes override
2014-12-12 13:33:14 +11:00
Rohan Mitchell
ca1c116a5d
Swap param order
2014-12-12 13:33:14 +11:00
Rohan Mitchell
d177f3ff73
Variant overrides table styling
2014-12-12 13:33:14 +11:00
Rohan Mitchell
d83ff4ef33
Remove short wait, show variant overrides tab in admin
2014-12-12 13:33:14 +11:00
Rohan Mitchell
fb980981fb
Display variant override errors
2014-12-12 13:33:14 +11:00
Rohan Mitchell
45e709b2cc
VariantOverrides require hub and variant
2014-12-12 13:33:14 +11:00
Rohan Mitchell
0393007ba5
Update variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
c38686c820
Create new variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
27444c6589
Extract variant overrides to own controller - permissions
2014-12-12 13:33:14 +11:00
Rohan Mitchell
531b35bbc6
WIP: Extract variant overrides to own controller - route, controller, views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
9ee44e9aef
WIP: Extract variant overrides to own controller - move views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
91434fe12a
Rename override_variants to variant_overrides - JS file names
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a6f116aa09
WIP: Rename override_variants to variant_overrides - JS
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d02511bf1d
WIP: Rename override_variants to variant_overrides - file and dir name changes
2014-12-12 13:33:13 +11:00
Rohan Mitchell
51d2805de9
WIP: Rename override_variants to variant_overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1906a71fa
Return promise directly
2014-12-12 13:33:13 +11:00
Rohan Mitchell
47592cdbd8
Submit variant overrides to server
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d67e614947
Remove extracted method
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0a984b9041
Remove duplicate status message on BPE
2014-12-12 13:33:13 +11:00
Rohan Mitchell
c62ce57e0f
Display count of dirty variant overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1fc4dec43
Updating variant overrides stores dirty values
2014-12-12 13:33:13 +11:00
Rohan Mitchell
7255520471
Display success message on save variant overrides (stub)
2014-12-12 13:33:13 +11:00
Rohan Mitchell
9d4b8ae949
Rename div update-status-message to status-message
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0938debafc
Extract status message markup into partial
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a8e1265a58
Swap parameter ordering - follows convention Rails.logger.error 'foo'
2014-12-12 13:33:13 +11:00
Rohan Mitchell
9c4c0f87e3
Rename methods to reduce naming duplication
2014-12-12 13:33:13 +11:00
Rohan Mitchell
bcc3815f6b
Extract status message to a service
2014-12-12 13:33:13 +11:00
Rohan Mitchell
abf58c0e02
Provide blank values for all variant overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d3e639aa03
Index variant overrides by hub_id x variant_id
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5cf3579b26
Extract variant overrides to service
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5df4f1b7fe
Convert text to form fields
2014-12-12 13:33:12 +11:00
Rohan Mitchell
3aedbb6c48
Display variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
8baed4429c
Indexer accepts arbitrary key to index by. Fix bug: Return an object instead of an array.
2014-12-12 13:33:12 +11:00
Rohan Mitchell
47b479c6c9
Show variants in override variants interface, not just products
2014-12-12 13:33:12 +11:00
Rohan Mitchell
42481e9691
Provide hub permissions to specs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
efae9265c1
Inject variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
ff28da345d
Find variant overrides for some hubs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
91b386003a
Add VariantOverrideSerializer
2014-12-12 13:33:12 +11:00
Rohan Mitchell
a3a3832c8d
Only show products that the chosen hub can add to an order cycle
2014-12-12 13:33:12 +11:00
Rohan Mitchell
500b5ce347
Enterprise managers can access override variants
2014-12-12 13:33:12 +11:00
Rohan Mitchell
b1ba519a73
When finding per hub order cycle enterprises, also return managed producers
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7
Inject hub permissions - which producers each hub can add to order cycle
2014-12-12 13:33:12 +11:00
Rob Harrington
3a9c4e0826
Adding a price without fees column to the order cycle customer report
2014-12-12 12:00:15 +11:00
Rob Harrington
6a226e4f92
Fixing typos and changing delivery address display in order confirmation email
2014-12-12 12:00:15 +11:00
Rohan Mitchell
086f69ccfb
Default payment method server/test_mode to live
2014-12-12 11:35:18 +11:00
Rohan Mitchell
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Lynne Davis
079781576b
Adding new specs and a couple updates the lib/report
2014-12-11 12:47:56 +00:00
Rob Harrington
b9011d9abe
Remove obsolete spree checkout views
2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346
Revert "Removing obsolete checkout views"
...
This reverts commit d0e013c1a5 .
2014-12-11 16:09:17 +11:00
Rob Harrington
dfb9e5bde5
Order reports now present the price of line items with adjustments included
2014-12-11 15:48:29 +11:00
Rohan Mitchell
eab2e5de2a
Use scope
2014-12-11 15:00:44 +11:00
Rob Harrington
3be437485a
Redirecting any spree checkout_state redirects to our checkout controller
2014-12-11 14:53:11 +11:00
Rob Harrington
d0e013c1a5
Removing obsolete checkout views
2014-12-11 14:50:29 +11:00
Maikel Linke
440044372b
Leave-page-warning only after changing inputs
...
The enterprise form is now set 'dirty' whenever an input changes. The
navigation callback confirms to leave the page only if the form is
dirty.
2014-12-11 14:27:08 +11:00
Maikel Linke
76739a4746
Unify nav-check and nav-callback attributes in nav-check-callback
...
The value of nav-check was not used and nav-callback was only important
if nav-check was given. So we need only one attribute, now named
nav-check-callback.
2014-12-11 12:14:51 +11:00
Maikel Linke
11f1261dd3
Navigation Callbacks for WebKit
2014-12-11 12:07:48 +11:00
Maikel Linke
27896534f0
Navigation Callbacks (confirmation to leave) refs
...
A navigation callback could give only a fixed value at load time. Now it
can act depending on the site's state just before the page is unloaded.
2014-12-11 12:05:59 +11:00
Rob Harrington
2f83d71931
Adding mail/all.css to assets precompile list
2014-12-10 09:56:33 +11:00
Lynne Davis
f878e18037
Update that works better with the specs
2014-12-08 16:25:18 +00:00
Maikel Linke
3cc79d0036
Filter deleted products in products report
...
BugHerd 484: Remove deleted products from Product / Inventory reports
2014-12-05 15:52:10 +11:00
Maikel Linke
7b41d4c5d4
Denoting the product category as required
...
Using common style: span.required *
2014-12-05 14:56:32 +11:00
Rohan Mitchell
ec08ab4cc9
Merge pull request #307 from openfoodfoundation/replace-fixtures
...
Replacing fixtures with minimal seeding
2014-12-04 16:31:30 +11:00
Maikel Linke
5c191bcc7f
Moving test seeding into spec/support/seeds.rb
2014-12-04 15:38:59 +11:00
Rohan Mitchell
19667f31fa
Add missing translation for welcome_to
2014-12-03 15:19:25 +11:00
Rohan Mitchell
95f8334370
Reinstate style
2014-12-03 12:28:22 +11:00
Rohan Mitchell
50e26ed96f
Remove old required partial
2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a
Merge branch 'master' into enterprise-form-required-fields
...
Conflicts:
app/views/admin/enterprises/_form.html.haml
app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
bd7253bdda
Merge branch 'using-simple-order-cycle'
2014-12-03 12:08:25 +11:00
Rohan Mitchell
fbef139fc5
Merge branch 'master' into using-simple-order-cycle
2014-12-03 11:57:59 +11:00
Lynne Davis
633a8a49e2
updating spec based on the wise advice of Rohan
2014-12-03 00:35:53 +00:00
Rohan Mitchell
3358fb3d73
Name based on meaning instead of context
2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8
Localize more strings on home page.
2014-12-03 09:39:36 +11:00
Paul Mackay
73ece4075c
Add rails-i18n gem.
2014-12-03 09:39:35 +11:00
Lynne Davis
a5ae1c490c
Fixing typo in report found through testing
2014-12-02 17:48:04 +00:00
Lynne Davis
c2c51a5531
Fixing typo in feature spec
2014-12-02 12:24:34 +00:00
Maikel Linke
8e280919ac
Using simple_order_cycle in clone spec
...
Creating a coordinator fee and two exchanges in the spec instead of
using a full order_cycle. Timing of this single test:
Before: 15.32 seconds
After: 6.26 seconds
2014-11-28 15:36:34 +11:00
Maikel Linke
e240933b29
Using simple_order_cycle in spec
...
Before: 4 minutes 6.9 seconds
After: 3 minutes 27.4 seconds
2014-11-28 14:45:35 +11:00
Maikel Linke
349b7de11a
Using simple_order_cycle
...
Before: 2 minutes 58.3 seconds
After: 35.04 seconds
2014-11-28 14:02:55 +11:00
Maikel Linke
73b8f37d77
Using simple_order_cycle
...
Before: 2 minutes 8.7 seconds
After: 16.11 seconds
2014-11-28 13:55:06 +11:00
Maikel Linke
aa2cefb88c
Using simple_order_cycle where applicable
...
Before: 3 minutes 0 seconds
After: 1 minute 21.02 seconds
2014-11-28 13:45:25 +11:00
Maikel Linke
ccd03bfa84
Using simple_order_cycle
...
Test timings were not accurate. Output:
4 order_cycles: 9.94 seconds
2 order_cycles: 9.87 seconds
0 order_cycles: 9.9 seconds
Felt execution was much higher
2014-11-28 13:20:05 +11:00
Maikel Linke
7f764db4d7
Using simple_order_cycle
...
order_cycle: 1 minute 56.88 seconds
simple_order_cycle: 1 minute 8.05 seconds
2014-11-28 12:39:05 +11:00
Maikel Linke
082a3cd9ab
Creating simple_order_cycle instead of order_cycle
...
Speedup on my machine:
1 minute 44.52 seconds
21.9 seconds
2014-11-28 12:29:47 +11:00
Lynne Davis
35c27bf516
First specs for additional scope to order model. Not liking the repeated code so would appreciate feedback to get rid of it. Thanks!
2014-11-27 20:36:41 +00:00
Rob Harrington
699c9a62a5
Removing pretty_inspect so that bugsnag alert work on production
2014-11-27 16:39:14 +11:00
Maikel Linke
ef0b0a9a94
Replacing fixtures with minimal seeding
...
Seeding:
1 country: Australia
2 states: Vic, NSW
2014-11-27 16:38:39 +11:00
Rob Harrington
9782a9d3d6
Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec
2014-11-27 14:42:02 +11:00
Rob Harrington
45bcee16ef
Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails
2014-11-27 09:44:13 +11:00
Rob Harrington
5799f09caf
Merge branch 'master' into pretty-emails
2014-11-27 00:02:44 +11:00
Rob Harrington
38440dd70a
Ammending checkout specs for two emails on placement of order
2014-11-26 23:16:11 +11:00
Rob Harrington
258573f5a6
Remove obsolete text version of user signup_confirmation
2014-11-26 18:58:26 +11:00
Rob Harrington
0cf2df8358
Remove obsolete text version of order confirm_email
2014-11-26 18:54:50 +11:00
Rob Harrington
8a3bffb37d
Cart page conforms to convention in rest of checkout, adjusting helpers through checkout
2014-11-26 18:53:29 +11:00
Rob Harrington
8f27c643f1
Move override for cart line item into existing view replacement
2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9
Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry
2014-11-26 15:16:53 +11:00
Rob Harrington
f5acf36771
Hiding enterprise shop url in ent welcome email, as that may bot actually make sense
2014-11-26 14:50:19 +11:00
Rob Harrington
17a2e37eda
Fixing broken category lookup on BPE
2014-11-26 13:16:29 +11:00
Rob Harrington
f6b0863279
Make cost breakdowns consistent throughout checkout
2014-11-26 13:07:40 +11:00
Rob Harrington
c4961d2502
Whitespace crusader
2014-11-26 11:59:22 +11:00
Matt-Yorkley
e4d1ae7548
Refactored currency symbol display
2014-11-24 18:20:10 +00:00
Matt-Yorkley
4f153714a8
Reports pages improvements and i18n
2014-11-23 17:26:26 +00:00
Matt-Yorkley
451dd3966f
form partial
2014-11-23 15:22:56 +00:00
Matt-Yorkley
c3829ae64f
Tax category dropdown on create product form
2014-11-23 15:18:16 +00:00
Rob Harrington
9bd3909449
Merge master into pretty-emails
2014-11-21 14:43:01 +11:00
Rob Harrington
2f28312f7e
Removing incorrectly placed directive in profile shops skinny view
2014-11-21 14:18:22 +11:00
Rohan Mitchell
49d5cb2f05
Do not show Override Variants tab - hide this until feature is ready
2014-11-21 13:49:09 +11:00
Rohan Mitchell
0b030a85ff
Incrementally load products
2014-11-21 13:49:09 +11:00
Rohan Mitchell
001bf999d0
Extract Spree API authorisation to service
2014-11-21 13:49:09 +11:00
Rohan Mitchell
824b00743e
Extract fetch-by-page from BPE to service
2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f
Display products in table
2014-11-21 13:49:09 +11:00
Rohan Mitchell
7069b30e71
Add indexer service (equivalent of Dereferencer, but named more accurately)
2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1
User can select a hub
2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720
Do not show producers in hubs list
2014-11-21 13:49:09 +11:00
Rohan Mitchell
4c9aa96b17
have_select2 can test for an exact set of options
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31
Show list of hubs to select for managing variant overrides
2014-11-21 13:49:09 +11:00
Rohan Mitchell
d810388248
Add have_select2 capybara matcher
2014-11-21 13:49:09 +11:00
Rohan Mitchell
bad5d798bf
Comment proxy classes
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2b0f6b7865
Add ProductProxy which wraps the product's variants in VariantProxys
2014-11-21 13:49:09 +11:00
Rohan Mitchell
f3fa5edb9d
Add simple variant proxy
2014-11-21 13:49:09 +11:00
Rohan Mitchell
f9b4c07219
Add initial VariantOverride model with price lookup
2014-11-21 13:49:09 +11:00
Rob Harrington
5e3f1e4a3b
Adding bugsnag notifier to work out what is happening with bug when adding variants to order
2014-11-21 12:37:56 +11:00
Rob Harrington
2c4b8d779c
Make application.yml available to travis
2014-11-21 10:17:43 +11:00
Rob Harrington
04b065e28a
Orders page doesn't crash when orders have no distributor
2014-11-21 10:15:40 +11:00
Rohan Mitchell
bf6d0a2beb
Port remaining specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
5eb40261a8
Port clone products specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
221e9344fd
Port fetch products specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
387d25b8f2
WIP: More extracting BulkProducts-specific specs to their own file
2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e2c979c96
WIP: Extracting BulkProducts-specific specs to their own file
2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e4d337773
Extract DisplayProperties to a service
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
356a03ac4e
WIP: Extract bulk product edit product management to BulkProducts service
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
f117c0cd24
Make spree_current_user available to serializers as 'scope'
2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc
In BPE, rename producer and category JSON attrs to producer_id and category_id
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2014-11-21 08:41:41 +11:00
Rohan Mitchell
021cca4fca
Stylistic changes
2014-11-21 08:41:41 +11:00
Rob Harrington
ebaaf2a136
Display line items in confirmation email with fees included in item totals
2014-11-20 20:17:18 +11:00
Rob Harrington
b64b48f26e
Removing obsolete MailerHelper reference
2014-11-20 20:16:34 +11:00
Rob Harrington
c310a3bdaa
Don't use svg for email header
2014-11-20 20:14:57 +11:00
Rob Harrington
46462a1abb
Format fiddling in user signup confirm email
2014-11-20 20:13:54 +11:00
Rohan Mitchell
b941ffabeb
Update README for Figaro config, add Maikel to credits
2014-11-20 16:20:07 +11:00
Rohan Mitchell
76c300283b
Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon
2014-11-20 15:59:06 +11:00
Rob Harrington
3d98ec6eef
Stripping out inline styles from enterprise email templates
2014-11-20 15:51:28 +11:00
Rob Harrington
4dd5e51ed5
Stripping out inline styles from user signup email template
2014-11-20 15:48:36 +11:00
Rob Harrington
1f42d32151
Remove naughty pry
2014-11-20 15:45:50 +11:00
Rob Harrington
f5a5b93c22
Can use relative paths for assets in emails because roadie
2014-11-20 15:45:12 +11:00
Rob Harrington
15d157abc0
Stripping out inline styles from email templates
2014-11-20 15:42:03 +11:00
Rohan Mitchell
8096ca2519
Merge remote-tracking branch 'origin/config' into config
2014-11-20 15:41:15 +11:00
Rob Harrington
2e84a8f626
Pull layout and roadie style inlining out into spree's base mailer so it applies to all mailers
2014-11-20 15:05:19 +11:00
Rob Harrington
ac6a043f40
Add roadie-rails to help with inlining styles for emails
2014-11-20 14:56:35 +11:00
Rob Harrington
fe0bb49baf
WIP: Adding templates for different order confirmation emails
2014-11-20 12:06:53 +11:00
Rob Harrington
20341ecbc1
Send bugsnag notification when order confirmation email fails
2014-11-20 12:04:51 +11:00
Rob Harrington
dd6a5ecd0b
Adding helper for assets in mailer views, fixing links in mailer layout
2014-11-19 16:42:31 +11:00
Rob Harrington
c9d0721acd
Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners
2014-11-19 11:03:00 +11:00
Lynne Davis
b81bf60dc2
267: Cont. Didn't realise commit -a doesn't add a file
2014-11-18 19:30:44 +00:00
Lynne Davis
cc0da142b7
267: Adding to new product form ability to add shipping category to record frozen/chilled
2014-11-18 19:28:49 +00:00
Lynne Davis
03b59eae75
266: Updating with rohans suggestions to tidy up and 'rubify' the code. Thanks for the tips Rohan!
2014-11-14 15:56:07 +00:00
Lynne Davis
e89184de02
286: Last sneaky dollar sign. Updated to use spree_number_to_currency
2014-11-14 14:24:22 +00:00
Rob Harrington
8d1facb7c3
Adding revamp of enterprise welcome email by @summerscope
2014-11-14 18:42:16 +11:00
Rob Harrington
0907e2d886
A few alterations to the enterprise email confirmation email
2014-11-14 18:10:40 +11:00
Rob Harrington
d182bb7bf7
Add signoff partial for mailer templates
2014-11-14 18:09:48 +11:00
Rob Harrington
b320f71771
Adding revamp for signup confirmation by @summerscope
2014-11-14 17:59:56 +11:00
Rob Harrington
27d1886d53
Fix mailto link
2014-11-14 17:58:13 +11:00
Rob Harrington
15559b2388
Merge branch 'master' into pretty-emails
2014-11-14 16:54:50 +11:00
Rob Harrington
ffb915ccc5
Orders page doesn't crash when orders have no distributor
2014-11-14 16:48:33 +11:00
Rob Harrington
d9d6b7bee4
Adding filtering to Users and Enterprises report
2014-11-14 16:36:22 +11:00
Rob Harrington
79a83ee206
Adding users and enterprises report, controller action and template
2014-11-14 16:36:22 +11:00
Rob Harrington
66a3410087
WIP: Adding new report to ability spec
2014-11-14 16:36:22 +11:00
Rob Harrington
65a5960fcc
WIP: Add route for User and Enterprise report
2014-11-14 16:36:22 +11:00
Lynne Davis
cc3959467d
285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-)
2014-11-13 10:30:00 +00:00
Rohan Mitchell
43bac4079f
Show hubs that are not ready for checkout so that we can view SEFH - Sample :/
2014-11-13 15:21:02 +11:00
Lynne Davis
15f29f4c8e
266: Adding ability to search by distribution
2014-11-12 18:52:25 +00:00
Lynne Davis
932d571d2c
266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id
2014-11-12 11:47:26 +00:00
Rohan Mitchell
43ddac84b0
I like nice code
2014-11-12 16:25:45 +11:00
Rohan Mitchell
2ca2d53273
Do not include perftools gem by default - it breaks Travis
2014-11-12 16:25:45 +11:00
Rohan Mitchell
4e655d7866
Uncouple migrations from models
2014-11-12 16:25:45 +11:00
Rob Harrington
7282c7174f
Moving alert box to top of section
2014-11-12 15:55:48 +11:00
Rob Harrington
7a719952fc
Adding informative messages about email confirmations to enterprise form
2014-11-12 15:20:52 +11:00
Rob Harrington
2c67066366
Add alert to enterprise edit page to remind user that confirmation email has been sent
2014-11-12 15:20:52 +11:00
Rob Harrington
6b21bbdf74
Reconfirmation email sends to the right address
2014-11-12 15:20:51 +11:00
Rob Harrington
ee2ee5dba7
Adding an enterprise welcome email
2014-11-12 15:20:51 +11:00
Rohan Mitchell
6953449d28
Merge pull request #288 from folklabs/doc-improvements
...
Small doc tweak to add db:setup command.
2014-11-12 14:40:33 +11:00
Lynne Davis
9a5ee81431
Changing report download titles in include download date
2014-11-11 17:49:08 +00:00
Rohan Mitchell
bb9b244d18
Upgrade paperclip to 3.x, fixes incorrect cropping of EXIF-rotated JPGs
2014-11-10 14:54:49 +11:00
Paul Mackay
1d0dab5cc6
Small doc tweak to add db:setup command.
2014-11-09 12:08:40 +00:00
Rob Harrington
0432fe229b
Add bottom margin to loading gif
2014-11-07 16:53:15 +11:00
Rob Harrington
66bbaabf79
Adding loading gif to shop page
2014-11-07 16:50:31 +11:00
summerscope
2addb1c472
Tweak producer register pane styling for lightweight view
2014-11-07 13:56:56 +11:00
summerscope
791cc9b301
Hide pricing table until language is sorted
2014-11-07 13:56:28 +11:00
summerscope
2166fbc8a0
Tweak wording for kirsten
2014-11-07 13:56:07 +11:00
summerscope
9f74e8ff03
Add caret to right on register buttons, kill commented out text
2014-11-07 12:05:35 +11:00
summerscope
4795de5ab0
Adding new partial into homepage
2014-11-07 08:49:09 +11:00
summerscope
039b94aa47
Styling for Producers Register pane and pricing table
2014-11-07 08:48:54 +11:00
summerscope
9a2e510f2c
Add Producers register link to footer
2014-11-07 08:48:37 +11:00
summerscope
cd34aedbb9
New partial for producer register pricing table
2014-11-07 08:48:24 +11:00
Rob Harrington
e1823212d6
Reconfirmation email not required when we already know about new email address for enterprise
2014-11-06 21:19:22 +11:00
Rob Harrington
898af0a55e
Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice
2014-11-06 21:19:21 +11:00
Rob Harrington
e6f5811a60
Only send confirmation instructions to the enterprise email address
2014-11-06 21:19:21 +11:00
Rob Harrington
70c4b7082d
Split ent confirmation email out into layout and partial
2014-11-06 21:19:21 +11:00
Rob Harrington
74642c3825
Update checkout helper spec to reflect Rohan's changes
2014-11-06 21:18:20 +11:00
Rohan Mitchell
3e151c40f5
WIP: Smooth scroll to checkout errors
2014-11-06 18:29:49 +11:00
Rohan Mitchell
57e7bc9504
Checkout: When error, open offending accordion section
2014-11-06 18:29:49 +11:00
Rohan Mitchell
4389389d44
Checkout: Display error when shipping or payment method is not selected
2014-11-06 18:29:49 +11:00
Rohan Mitchell
ca9da15ba4
Checkout: Fix shipping and payment method summary display when none selected
2014-11-06 18:29:48 +11:00
Rohan Mitchell
f2c6ee87d3
Extract duplicated checkout accordion heading to partial
2014-11-06 18:29:48 +11:00
Rohan Mitchell
519aea2d9b
Extract checkout shipping ship address to partial
2014-11-06 18:29:48 +11:00
Rohan Mitchell
433cf9dd9b
Checkout: Use validated_select for shipping address fields
2014-11-06 18:29:48 +11:00
Rohan Mitchell
7a0c291fc1
Checkout: Use validated_select for country
2014-11-06 18:29:48 +11:00
Rohan Mitchell
06a9110e95
Extract checkout select options to helpers
2014-11-06 18:29:48 +11:00
Rohan Mitchell
900a98b4bb
Display errors on checkout State field
2014-11-06 18:29:48 +11:00
Rohan Mitchell
e50d2a6a37
Remove unused directive
2014-11-06 18:29:48 +11:00
Rohan Mitchell
cbb968d87f
Pass checkout form to controller method
2014-11-06 18:29:48 +11:00
Rohan Mitchell
75b250d3fe
When submitting checkout, if field is invalid, show errors
2014-11-06 18:29:48 +11:00
Rohan Mitchell
e8e5f7033c
Improve all the syntax
2014-11-06 18:29:48 +11:00
Rob Harrington
51e768e722
Refactor EnterpriseSet to accept a collection as an argument
2014-11-06 16:29:09 +11:00
Rob Harrington
b27a0986b7
Ensure collection is locked down before we start asssigning attributes to model set
2014-11-06 16:28:24 +11:00
Rob Harrington
be042af751
Add explicit select statement to prevent scope being read only
2014-11-06 15:54:59 +11:00
Rob Harrington
93e3d87fcb
Errors on bulk update for enterprise index do not allow user to list all enterprises
2014-11-06 11:01:44 +11:00
Rohan Mitchell
1506b10d8f
Fix brittle spec
2014-11-05 16:08:45 +11:00
Rohan Mitchell
fdbb274667
Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout
2014-11-05 14:29:36 +11:00
Rohan Mitchell
a2f4732547
Merge branch 'folklabs-i18n'
2014-11-05 12:01:27 +11:00
Rohan Mitchell
98f434dad3
Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n
2014-11-05 11:54:42 +11:00
Lynne Davis
6f6ae309c6
266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet
2014-11-02 11:26:39 +00:00
Rohan Mitchell
8c2adb2a05
Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue
2014-11-01 12:11:50 +11:00
Rohan Mitchell
15b05de7f2
Fix specs: Distributors require shipping and payment method
2014-11-01 10:42:38 +11:00
Rohan Mitchell
0cf4e01dde
Fix specs: Expect proper query chain
2014-11-01 10:39:29 +11:00
Paul Mackay
543368169f
#254 : Localisation of home page and welcome email.
2014-10-31 06:59:43 +00:00
Rohan Mitchell
0d05c7163d
Use factory shortcut for creating shipping and payment methods
2014-10-31 16:26:13 +11:00
Rohan Mitchell
f5b20b7afc
Give distributors a payment and shipping method where required
2014-10-31 16:02:43 +11:00
Rohan Mitchell
e2d88e615b
Fix broken spec
2014-10-31 16:00:28 +11:00
Rohan Mitchell
8488b8e469
When user has selected a hub that is not ready for checkout, unselect it
2014-10-31 15:02:58 +11:00
Rohan Mitchell
7aefa05efd
Fix specs broken by requirement for valid shipping and payment method
2014-10-31 14:48:08 +11:00
Rohan Mitchell
abeabd5b1c
Add Enterprise#ready_for_checkout?
2014-10-31 14:04:43 +11:00
Rohan Mitchell
94d50f220f
Display an error message to admin when there are hubs in order cycles that are not ready for checkout
2014-10-31 12:22:02 +11:00
Rohan Mitchell
9f43146e47
Payment methods need to be available, too
2014-10-31 12:22:02 +11:00
Rohan Mitchell
f0d3b987d4
Show hubs as unavailable when they do not have available payment and shipping methods
2014-10-31 12:22:02 +11:00
Rohan Mitchell
1d9a3f33e0
Order cycle distributors must have shipping and payment methods
2014-10-31 12:22:02 +11:00
Rohan Mitchell
fc1c3abb9f
Remove duplicate data injection (duplicated in darkswarm layout)
2014-10-31 12:22:02 +11:00
Rohan Mitchell
433806aca8
Remove unused helpers and standardise naming
2014-10-31 12:22:02 +11:00
summerscope
34f47cedae
Fix markup for better layout and getting column padding sitting where it should
2014-10-30 17:03:09 +11:00
summerscope
733b249b12
making tabs break down better for responsive and small devices
2014-10-30 17:03:09 +11:00
summerscope
d8933deee0
Styling shopfront tabs make things better and more responsive
2014-10-30 17:03:09 +11:00
summerscope
a27a805478
Tweak styling so the accordion hover colors dont fight the validation colors
2014-10-30 17:03:08 +11:00
summerscope
38e6575781
Move first and last name fields to top of shipping address accordion
2014-10-30 17:03:08 +11:00
summerscope
799c894bd3
Tweak logo embedding to use new version, and use srcset with src as a fallback
2014-10-30 17:03:08 +11:00
summerscope
32daa1745c
Tweak logo for high density screens, make pretty and easier to read
2014-10-30 17:03:08 +11:00
summerscope
6329db23d7
Remove styling for capitalisation for shopfront page
2014-10-30 17:03:08 +11:00
Rob Harrington
6596e14e5d
Use shared partial for errors on EnterpriseFeeSet
2014-10-30 13:02:16 +11:00
Rob Harrington
65d13e0490
Show error messages on enterprise index page
2014-10-30 13:02:16 +11:00
Rob Harrington
977c508833
Make enterprise limit error messages more specific
2014-10-30 13:02:16 +11:00
summerscope
fd8eecf745
Remove unnecessary partial import
2014-10-30 11:30:21 +11:00
summerscope
64f2d1b34e
Remove unnecessary partial import
2014-10-30 11:30:03 +11:00
summerscope
f1e27a3ac3
No need to import typography into this file, add note for future devs
2014-10-30 11:29:42 +11:00
Rafael Schouten
2b0757e96f
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
2014-10-25 20:23:25 +11:00
Rob Harrington
43d3955627
Change wording of trial option on change_type_form
2014-10-25 19:56:52 +11:00
Rafael Schouten
68073d7239
revome config sidebar from index
2014-10-25 19:03:56 +11:00
Rafael Schouten
095dd28505
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
2014-10-25 18:53:46 +11:00
Rafael Schouten
feff4fd46f
fix reports taxons and specs
2014-10-25 18:51:03 +11:00
Rafael Schouten
6f1c90ea25
add toxons to prodcut reports
2014-10-25 17:09:23 +11:00
Rafael Schouten
098afacce3
Merge branch 'config' of https://github.com/openfoodfoundation/openfoodnetwork into config
2014-10-25 15:32:16 +11:00
Rafael Schouten
8395dbb3e9
Merge branch 'master' into config
...
Conflicts:
.gitignore
Gemfile
2014-10-25 15:29:53 +11:00
Rafael Schouten
33fc7e0fc9
Merge branch 'master' into checkout
2014-10-25 15:12:24 +11:00
Rob Harrington
6155600cb2
Set environment for payment methods unless admin
2014-10-24 18:15:48 +11:00
Rob Harrington
8385bff55e
Make admins get multi enterprise dashboard
2014-10-24 17:59:58 +11:00
summerscope
928e5dc474
Make styling more specific to single enterprise dashboard user only
2014-10-24 16:39:59 +11:00
Rob Harrington
cc0e205f50
Merge master into onbaording
2014-10-24 15:36:59 +11:00
Rob Harrington
80b36992f9
Merge in remote branch
2014-10-24 15:28:40 +11:00
Rob Harrington
a157528974
Adding specs for single ent dash and remove product ability for profiles
2014-10-24 15:27:08 +11:00
Rob Harrington
8b819539e7
Fixing specs
2014-10-24 14:52:59 +11:00
summerscope
2eb152f63e
Change class name for big button; change labels for submit buttons
2014-10-24 14:49:09 +11:00
summerscope
c733ca251e
Styling for big button
2014-10-24 14:48:46 +11:00
summerscope
d388747a81
Make margine appear for small devices only
2014-10-24 14:48:29 +11:00
Rob Harrington
8ac367675f
Adding big button class to CTA
2014-10-24 14:24:55 +11:00
Rob Harrington
96516a8ff3
User can switch between trialling a shopfront and not trialling a shopfront
2014-10-24 14:12:47 +11:00
Rob Harrington
3e002c6f82
Fiddle with text
2014-10-24 13:34:49 +11:00
Rob Harrington
20e2cb4ecc
Set visibility to false for enterprises created through registration process
2014-10-24 13:31:20 +11:00
Rob Harrington
b0d8290dab
Add alert for visibility to single ent dash
2014-10-24 13:28:25 +11:00
Rob Harrington
8603cf685e
Merge remote-tracking branch 'origin/onboarding' into onboarding
2014-10-24 13:03:04 +11:00
Rob Harrington
b182c6afc8
Merge in remote changes
2014-10-24 13:02:26 +11:00
summerscope
0d73d8f043
Fix layout add required class
2014-10-24 13:01:56 +11:00
Rob Harrington
498b51cedb
Switching out chevron on Change Type button
2014-10-24 12:54:21 +11:00
summerscope
01cb39a93f
Error messages specific to use case
2014-10-24 12:54:06 +11:00
summerscope
b172c4fd4f
Search query make empty string rather than undefined
2014-10-24 12:53:04 +11:00
summerscope
b3ac06e46c
Fix icon type to match nav bar
2014-10-24 12:42:14 +11:00
summerscope
68cb3efc50
Markup fixes for single enterprise dashboard (first state)
2014-10-24 12:39:25 +11:00
summerscope
e32ab7b4b7
Single enterprise dashboard styling
2014-10-24 12:39:08 +11:00
Rob Harrington
d0c3502f27
Adding trial progress bar
2014-10-24 12:32:05 +11:00
summerscope
631386ced4
Tweaking markup
2014-10-24 11:48:53 +11:00
summerscope
982be3a563
Stylesheet for single enterprise user dashboard components
2014-10-24 11:48:39 +11:00
summerscope
76c6c260d1
Add row containers to make grid nesting work
2014-10-24 11:48:13 +11:00
summerscope
0b3e293b38
Remove whitespace, add alert box
2014-10-24 11:26:58 +11:00
Rob Harrington
f40b4d9d03
Different text for CTA button depending on context
2014-10-24 11:22:57 +11:00
Rob Harrington
900ef4ddcc
Change type form is aware of existing state of enterprise
2014-10-24 11:12:54 +11:00
Rob Harrington
911d1e3dc4
Add down chevron to change type button on single ent dash
2014-10-24 11:02:48 +11:00
Rob Harrington
f03c7ba02d
Rename sellCtrl to changeTypeFormCtrl
2014-10-24 11:02:16 +11:00
summerscope
49a2b774b0
Tweak language in helper
2014-10-24 10:56:03 +11:00
Rob Harrington
f6b0324456
Add change type form to single enterprise dashboard
2014-10-24 10:43:04 +11:00
Rob Harrington
46ab424655
Moving welcomeCrtl to enterprise module as sellsCtrl
2014-10-24 09:10:45 +11:00
Rob Harrington
d2efd25e8d
Pull out type change form into a partial
2014-10-24 08:54:08 +11:00
summerscope
3c839be743
Tweak styling for error message to be consistent with other form error styling in admin
2014-10-23 17:24:56 +11:00
summerscope
cf06cab533
Tweak header to be consistent with other admin pages
2014-10-23 17:23:58 +11:00
Rohan Mitchell
9bc8531850
Add comment
2014-10-23 16:48:16 +11:00
Rohan Mitchell
ee5cd599aa
Add basic details for the single enterprise dashboard
2014-10-23 16:44:16 +11:00
Rohan Mitchell
aea8ab4c7f
Move #manages_one_enterprise? from User model to Permissions
2014-10-23 16:44:16 +11:00
Rob Harrington
e1cf5ceb57
Can set producer_profile_only using welcome page
2014-10-23 16:42:00 +11:00
Rob Harrington
996b2f2604
Adding 'producer_profile_only' flag to enterprises
2014-10-23 16:42:00 +11:00
Rob Harrington
d94ca0174a
Registration process sets sells to 'unspecified'
2014-10-23 16:42:00 +11:00
Rohan Mitchell
f09698be47
Select all works on simple order cycles edit interface
2014-10-23 15:54:52 +11:00
Rohan Mitchell
7faf6e12ea
Clean up simple order cycle interface
2014-10-23 15:53:16 +11:00
summerscope
4f2327f05c
More styling for Next button and error message
2014-10-23 15:46:56 +11:00
Rob Harrington
d50cd023d4
Adding login nav to header on bare_admin layout
2014-10-23 15:38:06 +11:00
summerscope
ce346d3bca
Styling stripes with CSS3, remove the image instead
2014-10-23 15:17:33 +11:00
Rob Harrington
e67f039791
Merging in remote changes
2014-10-23 14:53:21 +11:00
Rob Harrington
e9a6c9d0ce
Adding header to welcome page
2014-10-23 14:50:56 +11:00
Rob Harrington
67c82e81de
Fixing form on welcome page
2014-10-23 14:41:00 +11:00
summerscope
04af954432
Tweak language
2014-10-23 14:33:19 +11:00
Rob Harrington
bcc8198019
Merge in changes on remote branch
2014-10-23 14:30:56 +11:00
summerscope
d6947b119f
Welcome markup make alternative markup consistent
2014-10-23 14:28:53 +11:00
summerscope
204c7d9690
Selected state push
2014-10-23 14:26:52 +11:00
Rob Harrington
77c0e36ed6
Adding input validation to welcome page
2014-10-23 14:23:50 +11:00
summerscope
694724d177
Refactoring and styling Welcome screen dashboard admin WIP
2014-10-23 14:23:35 +11:00
summerscope
bf9cd4a12b
Tweak image add gradient blur and slightly less dark
2014-10-23 14:23:23 +11:00
summerscope
f5aae7d214
Pretty stripy background tile
2014-10-23 14:23:04 +11:00
Rohan Mitchell
bf61d12bfa
Merge branch 'simple-order-cycles'
...
Conflicts:
app/views/admin/order_cycles/_row.html.haml
2014-10-23 12:11:34 +11:00
Rob Harrington
7d9c5f9e2c
Adding form elements for submission of sells preferences on welcome page
2014-10-23 11:40:11 +11:00
Rob Harrington
b11c291df1
Add set_sells controller action for enterprises
2014-10-23 11:39:33 +11:00
Rob Harrington
5a837226a4
Route set_sells through put rather than post
2014-10-23 11:38:51 +11:00
Rohan Mitchell
ab76c66b68
Admin can update order cycles with simple interface
2014-10-23 11:38:15 +11:00
Rohan Mitchell
f7c1340f99
Admin can view an order cycle in the simple edit form
2014-10-23 11:08:27 +11:00
summerscope
2f045203ab
Styling welcome page WIP
2014-10-23 10:56:40 +11:00
summerscope
842e239893
Make selector containers anchors
2014-10-23 10:56:30 +11:00
Rob Harrington
2e0d5eb829
Adding set_sells action to enterprises
2014-10-23 10:27:53 +11:00
Rohan Mitchell
56ebe688dc
Fix file naming
2014-10-23 10:22:03 +11:00
Rohan Mitchell
8b616e7d17
Add unit spec for order cycles simple create controller
2014-10-23 10:21:19 +11:00
Rohan Mitchell
2ad823a79d
Fix JS specs
2014-10-23 09:39:23 +11:00
Rohan Mitchell
94e1995469
Merge branch 'master' into simple-order-cycles
2014-10-23 09:36:03 +11:00
Rohan Mitchell
f74ec03cef
Rename
2014-10-23 09:26:55 +11:00
Rohan Mitchell
66e13d40f4
Select all works on simple order cycles interface
2014-10-22 19:17:28 +11:00
Rob Harrington
f60a9d7bd5
Fiddling with styling
2014-10-22 19:13:17 +11:00
Rohan Mitchell
d47db903fb
Add basic styling to simple order cycle interface
2014-10-22 19:12:51 +11:00
Rob Harrington
262972a911
Adding basic angular to welcome form
2014-10-22 19:02:39 +11:00
Rob Harrington
fef97314cb
Adding basic layout of welcome page for new users
2014-10-22 18:26:18 +11:00
Rafael Schouten
069b9ce91d
fix email length validation spec
2014-10-22 17:49:44 +11:00
Rohan Mitchell
3e61aa7267
Simple interface remove coordinator fee
2014-10-22 17:26:22 +11:00
Rafael Schouten
69614d6cf1
fix accordion jumps
2014-10-22 17:23:06 +11:00
Rohan Mitchell
28352be729
Save pickup time and instructions
2014-10-22 17:17:05 +11:00
Rohan Mitchell
549ef4b79d
When saving an OC from the simple interface, include outgoing variants
2014-10-22 17:08:16 +11:00
Rohan Mitchell
8fb95769bf
Fix tested values in spec
2014-10-22 17:07:45 +11:00
Rob Harrington
7113875a45
Adding welcome page to overview controller
2014-10-22 16:49:32 +11:00
Rob Harrington
8120023094
Fixing indentation
2014-10-22 16:33:43 +11:00
Rob Harrington
82d33332ab
Adding shop_trial_start_date column to enterprises
2014-10-22 16:11:51 +11:00
Rob Harrington
ecaa2e6a51
Pull out override of 'visible' flag in enterprise serialiser
2014-10-22 15:53:25 +11:00
Rob Harrington
45ed3a4cff
Only pushes activated enterprises through to the frontend
2014-10-22 15:39:49 +11:00
Rafael Schouten
2b86647281
Merge branch 'master' into bugfix
2014-10-22 15:35:00 +11:00
Rafael Schouten
96ff387d1f
fix navigation check on submission
2014-10-22 15:34:31 +11:00
Rob Harrington
565d6739b3
Add 'activated' scope to enterprises
2014-10-22 15:13:52 +11:00
Rafael Schouten
a53cbb677d
fix report typos
2014-10-22 14:55:01 +11:00
Rafael Schouten
afa6119ec1
better coverage for enterprise abilities, hide products from non producers
2014-10-22 14:53:20 +11:00
Rafael Schouten
175e430a2b
uss oop for nav check
2014-10-22 14:51:17 +11:00
Rob Harrington
6798d394bb
Use unspecified rather than unconfirmed
2014-10-22 14:50:22 +11:00
Rob Harrington
7ff4306991
Adding 'unspecified' option to 'sells' on Enterprise
2014-10-22 13:13:21 +11:00
Rob Harrington
3d938b3450
Shifting dashboard rendering from partials to templates
2014-10-22 12:30:07 +11:00
Rob Harrington
8bf472e970
Split dashboard into single and multiple enterprise views
2014-10-22 12:21:25 +11:00
Rohan Mitchell
b75af8d9ff
Fix sells column coming out all 'none'
2014-10-22 10:49:23 +11:00
Rohan Mitchell
4308f7d09c
Revert "use sql for migration"
...
This reverts commit fec8f08966 .
2014-10-22 09:43:10 +11:00
Rafael Schouten
89ce4ba632
Merge branch 'master' into bugfix
...
Conflicts:
app/models/enterprise.rb
2014-10-21 08:51:23 +11:00
Rafael Schouten
fec8f08966
use sql for migration
2014-10-18 16:17:29 +11:00
Rafael Schouten
78b0e02ffe
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
2014-10-18 16:03:04 +11:00
Rafael Schouten
9e0f8100d9
only producers have product permissions
2014-10-18 08:28:08 +11:00
Rafael Schouten
08cd273be3
Merge branch 'migrate_ent_types' into bugfix
...
Conflicts:
app/models/spree/ability_decorator.rb
2014-10-18 07:37:41 +11:00
Rafael Schouten
2a7dd8b8f1
update ability specs for reports
2014-10-18 06:53:38 +11:00
Rafael Schouten
b71a40ae6d
show all permitted enterprises in order cycle summery
2014-10-18 03:26:57 +11:00
Rafael Schouten
87cc1d6217
create db/backup folder if it dosnt exist
2014-10-18 01:43:19 +11:00
Rafael Schouten
577cb06371
make navCallback actually versatile
2014-10-18 01:42:29 +11:00
Rob Harrington
361116a9ec
Explicitly set confirmed_at for unconfirmed enterprise
2014-10-17 18:31:35 +11:00
Rob Harrington
cae8d566df
Explicit confirmed_at to ensure that confirmation emails are sent
2014-10-17 17:49:18 +11:00
Rob Harrington
f499cc375b
Adding confirmed_at to enterprise factory
2014-10-17 17:32:27 +11:00
Rob Harrington
338ba74652
Only show enterprise partial when no enterprises exist
2014-10-17 17:15:49 +11:00
Rob Harrington
5b3ff9160d
Fix Registration spec
2014-10-17 17:15:16 +11:00
Rohan Mitchell
deedafde9a
WIP: Simple order cycle form loads and displays correct info
2014-10-17 16:55:55 +11:00
Rohan Mitchell
d8b648d531
Extract name and timing form from order cycles
2014-10-17 16:51:03 +11:00
Rohan Mitchell
078d2bac11
Extract factories from order cycles admin angular
2014-10-17 16:50:16 +11:00
Rob Harrington
e24a774d54
Adding schema
2014-10-17 16:16:17 +11:00
Rob Harrington
4d078feea2
Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise)
2014-10-17 16:12:51 +11:00
Rohan Mitchell
f060da9c8d
Rename angular app order_cycle -> admin.order_cycles
2014-10-17 14:13:27 +11:00
Rob Harrington
b2565991e6
Merge branch 'master' into reg_and_ent_types
2014-10-17 12:33:21 +11:00
Rob Harrington
eda0b16a5f
Make state abbreviations upper case
2014-10-17 12:29:51 +11:00
Rob Harrington
e9a3f8ce91
Require user to choose producer or not
2014-10-17 12:29:51 +11:00
Rob Harrington
a6bc9e66f6
Only send one enterprise creation confirmation email
2014-10-17 12:29:51 +11:00
summerscope
b671543a95
Style and make pretty the finished step of profile creation
2014-10-17 12:25:04 +11:00
summerscope
4abc59f66d
Change styling on the enterprise name because we dont know what type it is yet
2014-10-17 12:02:21 +11:00
summerscope
4aa2aa5aee
Tweaking layout, text, styling for registration box
2014-10-17 11:56:25 +11:00
summerscope
2c5208ce6b
Change ent type page, simplify!
2014-10-17 11:17:53 +11:00
Rob Harrington
81715aaf5d
Remove unrequired store registration action
2014-10-17 11:01:39 +11:00
Rob Harrington
c4d47ccc20
Change enterprise attributes defined in reg controller
2014-10-17 11:01:38 +11:00
Rohan Mitchell
694dd0c329
Enterprise user selling own produce only sees simple order cycle listing
2014-10-17 10:52:36 +11:00
summerscope
4884734ab5
Align Continue buttons right consistently
2014-10-17 10:43:19 +11:00
Rob Harrington
28807d4f4d
Merge migrate_ent_types into reg
2014-10-17 10:20:48 +11:00
Rob Harrington
6a6f603754
Correct syntax for update column
2014-10-17 10:03:34 +11:00
Rafael Schouten
2e3cb171a3
don't remove indexes after you remove one of their columns!
2014-10-17 08:22:52 +11:00
Rafael Schouten
b853f908d3
bugfix email dummy
2014-10-17 08:08:10 +11:00
Rafael Schouten
1a40c83a48
update chema with indexes
2014-10-17 07:59:51 +11:00
Rafael Schouten
9536b3e764
add navigation directive default
2014-10-17 07:58:08 +11:00
Rafael Schouten
f1280a31a6
Merge branch 'reports' into bugfix
2014-10-17 07:41:30 +11:00
Rafael Schouten
245c1eb305
use a directive for navigation check to attach it to the page instead of the controller
2014-10-17 07:40:08 +11:00
Rafael Schouten
bda1eafcec
add migrating for dummy emails
2014-10-17 06:37:22 +11:00
Rafael Schouten
dd3101f27a
remove some bangs
2014-10-17 06:14:39 +11:00
Rafael Schouten
45b0581b7b
Merge branch 'master' into bugfix
2014-10-17 05:35:10 +11:00
Rafael Schouten
3234bc328f
Merge branch 'master' into reports
2014-10-17 04:02:29 +11:00
Rafael Schouten
4defb38cf4
update karma config
2014-10-17 04:01:36 +11:00
Rafael Schouten
1150e69500
fix visible bug
2014-10-17 03:59:48 +11:00
Rob Harrington
c7145f8dcd
Merge branch 'reg' of github.com:openfoodfoundation/openfoodnetwork into reg
2014-10-16 16:53:34 +11:00
Rafael Schouten
6fd9741daf
use build instead of create, and reorganise code
2014-10-16 16:51:09 +11:00
Rafael Schouten
a1d74649f3
rename spec and clear todo
2014-10-16 16:50:19 +11:00
Rafael Schouten
f145db46f1
use self.x
2014-10-16 16:49:49 +11:00
Rafael Schouten
1b0000a1de
use bangs
2014-10-16 16:48:01 +11:00
summerscope
8d01bb7ebf
Pretty responsive email template!!!!!!!!
2014-10-16 16:45:15 +11:00
Rafael Schouten
425105174e
return space remover
2014-10-16 16:26:50 +11:00
Rafael Schouten
c5afd8cebf
move visible filter to pages, and use category
2014-10-16 16:26:50 +11:00
Rafael Schouten
027189ac3c
rename check methods
2014-10-16 16:26:49 +11:00
Rafael Schouten
f0a3296e52
change enterprise category name ans use symbols instead of strings
2014-10-16 16:26:49 +11:00
Rob Harrington
7db68795a4
Redirect to admin root after confirmation
2014-10-16 16:06:54 +11:00
Rafael Schouten
2e8417d9e8
bugfix migration and add indexes
2014-10-16 16:05:07 +11:00
Rohan Mitchell
0e03b5f209
Admin can change the format that Spree::Images are stored/served in
2014-10-16 12:41:11 +11:00
Rohan Mitchell
7e23479f3a
Consistency
2014-10-16 12:08:12 +11:00
Rob Harrington
a6480e6831
Merge in enterprise confirmation
2014-10-16 11:52:10 +11:00
Rob Harrington
63e50dc88c
Fiddle with alert styling
2014-10-16 11:34:06 +11:00
Rafael Schouten
fd7191f476
add missing orders_and_distributors perm
2014-10-16 05:26:38 +11:00
Rafael Schouten
9343c3608b
allow supplier enterprise manager to see bulk coop reports
2014-10-16 04:29:33 +11:00
Rafael Schouten
1577c01a77
add reports abilities specs
2014-10-16 04:29:33 +11:00
Rafael Schouten
46df14c0d9
refator reports controller a little
2014-10-16 04:29:33 +11:00
Rafael Schouten
e44fed2ff0
add authorization to reports listings on index page
2014-10-16 04:29:33 +11:00
Rafael Schouten
0d715ce615
split report permissions
2014-10-16 04:29:16 +11:00
Rob Harrington
96878f5dcb
Don't require confirmation for enterprises where the email address has already been confirmed for another enterprise
2014-10-15 17:22:56 +11:00
Rob Harrington
20cb11a298
Update registration spec
2014-10-15 16:28:52 +11:00
Rob Harrington
0940af6b66
Remove bad pry
2014-10-15 16:21:11 +11:00
Rob Harrington
e0e8ba814f
Show explanation of confirm process on final page of registration
2014-10-15 16:20:45 +11:00
Rob Harrington
c59662758c
Add alerts for unconfirmed enterprises to overview page
2014-10-15 15:46:21 +11:00
Rob Harrington
c76a3815c0
Add unconfirmed scope
2014-10-15 15:45:47 +11:00
Rob Harrington
1bdc55cb33
Adding confirmed scope to enterprises
2014-10-15 13:03:39 +11:00
Rob Harrington
56f4d5af0f
Visibility in the front end is contingent upon enterprise being confirmed
2014-10-15 12:27:55 +11:00
Rob Harrington
6e699b2e8b
Mailer tests
2014-10-15 11:52:04 +11:00
Rob Harrington
908c242d36
Confirmation email when creating enterprise
2014-10-15 10:48:05 +11:00
Rafael Schouten
5e41865871
add utils angular module and navigation check factory
2014-10-14 00:26:04 +11:00
Rafael Schouten
5dd9879b96
validate description max lenth
2014-10-12 21:57:01 +11:00
Rafael Schouten
01c179856a
set maxlength for short description field
2014-10-12 21:19:59 +11:00
Rafael Schouten
9a6958573a
Merge branch 'master' into bugfix
...
Conflicts:
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2014-10-12 21:19:02 +11:00
summerscope
a4e72f6fbc
Making the header more semantically meaningful for HTML5. Add in row to make spacing consistent. Steps bar moves to top
2014-10-10 18:20:38 +11:00
summerscope
89a51bf1da
Adjustments to layout, responsive logic, simplify column structure
2014-10-10 18:19:42 +11:00
summerscope
d4318263f6
Registration modals styling WIP
2014-10-10 18:18:33 +11:00
Rafael Schouten
3ad7165fd6
add checkout subbmission directive
2014-10-10 17:53:28 +11:00
Rob Harrington
b8b19368df
WIP: Making enterprise emails confirmable
2014-10-10 16:54:38 +11:00
Rohan Mitchell
d5ea2a0206
Make Enterprise and EnterpriseGroup promo images jpg format
2014-10-10 15:40:05 +11:00
Rafael Schouten
01aa8cb761
Use serialiser instead of rabl for current order injection
2014-10-10 15:30:53 +11:00
Rafael Schouten
b68754d634
put payment description in panel
2014-10-10 15:22:21 +11:00
Rob Harrington
9b275cc5f0
WIP: Shuffling around order of cards in registration
2014-10-09 17:26:31 +11:00
Rob Harrington
d1e3f74c03
Add loading gif to image uploaders
2014-10-09 15:56:54 +11:00
Rob Harrington
fc3a132c12
Closing auth dialog on pages other than home returns the user to home
2014-10-09 13:46:32 +11:00
Rob Harrington
31c4aad9e1
JS for closing alerts works
2014-10-09 13:21:30 +11:00
Rob Harrington
49c8e2f8cb
Remove used styling for inline flash
2014-10-09 13:16:09 +11:00
Rob Harrington
83f9867632
Move registration login into own folder, reinstate ofn-inline-alert
2014-10-09 13:15:19 +11:00
Rob Harrington
65ac9d7226
Merge branch 'master' into reg
2014-10-09 09:26:17 +11:00
Rafael Schouten
e7b847542f
bugfix tab selection
2014-10-08 01:59:56 +11:00
Rafael Schouten
20a94b4365
Merge branch 'master' into migrate_ent_types
...
Conflicts:
app/serializers/api/admin/enterprise_serializer.rb
2014-10-07 10:52:26 +11:00
Rafael Schouten
9b6db2bff4
simplify tab selection
2014-10-07 10:49:57 +11:00
Rafael Schouten
6fc36a3e6c
swap redundant producer modal for general enterprise modal
2014-10-07 10:48:04 +11:00
Rafael Schouten
e476324c60
fix for_order_cycle test
2014-10-07 00:22:45 +11:00
Rafael Schouten
ec6805f573
use shared partial for no results
2014-10-06 23:51:19 +11:00
Rafael Schouten
7805d46743
more angular documentation
2014-10-06 23:20:43 +11:00
Rafael Schouten
881e82e825
add some angular documentation
2014-10-06 22:59:06 +11:00
Rafael Schouten
2ae325455a
fix producer taxon filtering bug
2014-10-06 22:58:48 +11:00
Rafael Schouten
922e335e83
add is_hub to model
2014-10-06 15:42:23 +11:00
Rafael Schouten
cc6af82823
move reports abilitiy to can manage products block, producers need to use this too
2014-10-06 15:40:41 +11:00
Rafael Schouten
76e170eb3a
move icons into cached, for now
2014-10-06 10:44:49 +11:00
Rafael Schouten
c495e967cb
bugfix and extend angular enterprise spec
2014-10-06 01:36:18 +11:00
Rafael Schouten
017d6b1273
move for order cycles permission, for now, but needs review
2014-10-06 01:35:46 +11:00
Rafael Schouten
9eb770aed7
fix sidebar show/hide
2014-10-05 01:44:40 +10:00
Rafael Schouten
2f76a7ba80
add comment for hub sells own case
2014-10-05 01:44:12 +10:00
Rafael Schouten
58c39b340d
remove duplicate default value assignment
2014-10-05 01:43:50 +10:00
Rafael Schouten
f0c9e7cd44
fix for tests, remove open in new tab
2014-10-04 13:12:36 +10:00
Rafael Schouten
f3fc70ebf0
Merge branch 'master' into raf_bugfix
...
Conflicts:
app/assets/stylesheets/admin/openfoodnetwork.css.scss
2014-10-04 12:51:55 +10:00
Rafael Schouten
884c111240
fix failing tests
2014-10-04 11:56:35 +10:00
Rafael Schouten
698126edb2
specifify visible enterprises in tests
2014-10-04 01:01:04 +10:00
Rafael Schouten
b3482a087b
separate enterprises from visible enterprises
2014-10-04 01:00:37 +10:00
Rafael Schouten
a552fb18da
style profile check
2014-10-04 01:00:02 +10:00
Rafael Schouten
2670d2b0ad
cleanup serializer
2014-10-04 00:59:41 +10:00
Rafael Schouten
01063367c4
clickable show profiles label
2014-10-04 00:59:17 +10:00
Rafael Schouten
a0494b136f
test that email is validated
2014-10-03 17:32:04 +10:00
Rafael Schouten
c088c47a49
add email to enterprise params
2014-10-03 17:31:46 +10:00
Rafael Schouten
77e354f9f6
Merge branch 'master' into wys
2014-10-03 16:47:11 +10:00
Rafael Schouten
dee471b1c7
move text angular files
2014-10-03 16:43:56 +10:00
Rafael Schouten
bdd9e19efe
specs - add text angular dep and long descrioption provider
2014-10-03 16:42:37 +10:00
Rafael Schouten
34ceb9c226
style text box
2014-10-03 16:06:15 +10:00
Rafael Schouten
bb24e1ce88
sanitize long_description html before injection
2014-10-03 16:06:04 +10:00
Rafael Schouten
e75a964703
Merge branch 'master' into raf_bugfix
2014-10-03 14:26:08 +10:00
Rafael Schouten
8805079faa
use attubutes instead of save!
2014-10-03 14:03:34 +10:00
Rafael Schouten
7313aecd19
add route checking, not working yet...
2014-10-03 12:19:58 +10:00
Rafael Schouten
929839cb9f
hide configuration on
2014-10-03 11:46:00 +10:00
Rafael Schouten
d707ba1a70
remove nokugiri from gemfile.lock
2014-10-02 19:08:37 +10:00
Rafael Schouten
ff4f8f63af
Merge branch 'master' into raf_bugfix
...
Conflicts:
app/views/spree/order_mailer/confirm_email.text.haml
2014-10-02 19:06:30 +10:00
Rafael Schouten
b3520c4385
Bugfix for specs
2014-10-02 16:49:32 +10:00
Rafael Schouten
526ab8b80f
use is_distributor bool
2014-10-02 16:28:01 +10:00
Rafael Schouten
f29898886d
return basic css and js for oldskool login that somehow still exists
2014-10-02 13:24:59 +10:00
Rafael Schouten
1e84e4fa85
own and any instead of single and full for abilities
2014-10-02 13:11:19 +10:00
Rafael Schouten
ce9b132ab5
only show visible enterprises
2014-10-02 13:10:46 +10:00
Rob Harrington
5f4b2a752b
Product controller loads correct data for create and update actions
2014-10-02 12:32:26 +10:00
Rafael Schouten
4c1fc5671f
Minor fixes
2014-10-02 10:43:17 +10:00
Rafael Schouten
e62e87549a
commit this elsewhere
2014-10-02 10:41:43 +10:00
Rafael Schouten
62f7114fa1
Merge branch 'cleanup' into migrate_ent_types
...
Conflicts:
app/views/home/_hubs.html.haml
2014-10-02 10:02:08 +10:00
Rafael Schouten
47dc001735
merge has_shopfront and is_distibutor
2014-10-01 20:27:53 +10:00
Rafael Schouten
3877bed62b
use enterprise modal
2014-10-01 18:51:49 +10:00
Rafael Schouten
ccdcf16cec
rename file
2014-10-01 18:47:50 +10:00
Rafael Schouten
54b138b2cc
add transclusion to modal directive by default
2014-10-01 18:47:22 +10:00
Rafael Schouten
412bf8f638
cleanup gemfile
2014-10-01 17:16:09 +10:00
Rafael Schouten
b647f9382f
revert included file
2014-10-01 17:11:00 +10:00
Rafael Schouten
56a9658b14
update ability spec
2014-10-01 16:55:41 +10:00
Rafael Schouten
47991f192e
tweak migration
2014-10-01 16:49:47 +10:00
Rafael Schouten
4fde0ad2d7
Merge branch 'master' into migrate_ent_types
2014-10-01 16:11:20 +10:00
Rafael Schouten
1ec4f2e456
Merge branch 'ent_types_frontend' into migrate_ent_types
...
Conflicts:
app/models/enterprise.rb
2014-10-01 16:10:43 +10:00
Rafael Schouten
3a14a26bc6
refactor wysiwyg
2014-10-01 16:07:10 +10:00
Rafael Schouten
fa41f6dc40
add rollback to migration
2014-10-01 13:02:21 +10:00
Rob Harrington
5497f229e1
Ignoring enterprise ownership before_validations when no owner set
2014-10-01 11:49:46 +10:00
Rafael Schouten
206c8da0ba
remove unused css*
2014-09-30 23:53:45 +10:00
Rafael Schouten
a2dff2305f
space in order confirm mailer
2014-09-30 19:39:56 +10:00
Rafael Schouten
726340fc86
configure textAngular on enterprise edit page
2014-09-30 18:20:45 +10:00
Rafael Schouten
823923f828
add textAngular javascript
2014-09-30 15:09:43 +10:00
Rafael Schouten
a49991c696
set abilities tests to pending, need to discuss further
2014-09-28 22:55:49 +10:00
Rafael Schouten
dc7c9ea272
commit updated schema
2014-09-28 22:37:26 +10:00
Rafael Schouten
58f13a3e06
update migration
2014-09-28 12:57:27 +10:00
Rafael Schouten
5c0d846643
bugfix sells and is_distributor specs and code
2014-09-28 11:55:46 +10:00
Rafael Schouten
b821107c27
bugfix migration ad specs
2014-09-27 18:14:10 +10:00
Rafael Schouten
beb85e862a
get type > sells migration mostly working
2014-09-27 15:21:27 +10:00
Rafael Schouten
dee869a273
move checks and links in sidebars
2014-09-26 17:58:00 +10:00
summerscope
0c99007323
Tweak the modal styling for register modals
2014-09-26 17:45:15 +10:00
Rafael Schouten
92a40fc842
order mailer edits
2014-09-26 17:21:41 +10:00
Rob Harrington
4b2f1cefa0
Spliting order management abilities out of product management abilities
2014-09-26 17:11:11 +10:00
summerscope
c91d707806
Merge branch 'master' into ent_types_frontend
2014-09-26 15:07:30 +10:00
Rob Harrington
299b0fe5be
Allowing all enterprise users to access products
2014-09-26 15:01:23 +10:00
summerscope
2ea0c89899
Style the modal headers
2014-09-26 15:01:23 +10:00
summerscope
237d129710
Changing the markup to give a class where is a producer
2014-09-26 15:01:23 +10:00
Rafael Schouten
e9c8547ca3
fix enterprsie model logic
2014-09-26 15:01:23 +10:00
summerscope
dee503befb
Tweak language around the long description
2014-09-26 15:01:22 +10:00
summerscope
781fcae946
Change styling for register modals
2014-09-26 15:01:22 +10:00
summerscope
3adf571c1f
Style the modal headers
2014-09-26 14:55:41 +10:00
summerscope
c43b8abcbc
Changing the markup to give a class where is a producer
2014-09-26 14:55:41 +10:00
Rafael Schouten
3406f926fc
fix enterprsie model logic
2014-09-26 14:48:37 +10:00
Rafael Schouten
e480d3a135
rearrange admin sidebars
2014-09-26 13:06:29 +10:00
summerscope
c1460afaee
Tweak language around the long description
2014-09-26 12:07:58 +10:00
summerscope
a73541da71
Change styling for register modals
2014-09-26 12:07:38 +10:00
Rob Harrington
d3c8e4a547
Replacing reference to is_profile
2014-09-26 11:20:55 +10:00
summerscope
a6e8d6906f
Tweak message on profile label
2014-09-26 11:20:09 +10:00
Rafael Schouten
ceb978783c
update missed taxon selector filter
2014-09-26 00:25:19 +10:00
Rafael Schouten
4b576d1590
refactor enterprise specs
2014-09-26 00:15:33 +10:00
Rafael Schouten
04c5dff497
fixup merge
2014-09-25 19:47:00 +10:00
Rafael Schouten
55f4415c0d
Merge branch 'master' into cleanup
...
Conflicts:
app/assets/javascripts/darkswarm/services/hubs.js.coffee
app/views/home/_hubs.html.haml
app/views/producers/_filters.html.haml
app/views/producers/index.html.haml
2014-09-25 19:42:20 +10:00
Rob Harrington
be17d80cc4
Fixing hubs service spec
2014-09-25 17:28:01 +10:00
Rob Harrington
85b27f5b51
Adding angularjs-file-upload to spec manifest
2014-09-25 17:25:48 +10:00
Rob Harrington
b55b4e9a0c
Merge branch 'master' into ent_types_frontend
2014-09-25 17:20:15 +10:00
Rob Harrington
33dff551c7
Removing 'show profiles' from producer and shop pages
2014-09-25 17:19:57 +10:00
Rob Harrington
1e31dd88ee
Remove unrequired functions, add has_hub_listing
2014-09-25 17:19:57 +10:00
summerscope
cbc8a62686
STyling for profile only small view
2014-09-25 17:02:41 +10:00
summerscope
3b7cd6d329
Making the styling work for profiles and producers
2014-09-25 16:54:17 +10:00
summerscope
97ae170dd1
Add in profile only use case to styling
2014-09-25 16:40:06 +10:00
summerscope
3812d1eebb
Add more greys
2014-09-25 16:39:48 +10:00
summerscope
2e1b2ffe12
Add italics
2014-09-25 16:04:27 +10:00
summerscope
a068411b7d
Add in class to show when hub is
2014-09-25 16:00:03 +10:00
Rafael Schouten
6069127733
validate contact email
2014-09-25 15:16:50 +10:00
Rafael Schouten
afd0f76d9e
Merge branch 'master' into bugfix
2014-09-25 14:23:46 +10:00
Rafael Schouten
f8b083e4b7
fix lost hub link
2014-09-25 14:04:10 +10:00
Rafael Schouten
bab9123ca8
delete unused javascript
2014-09-25 14:01:06 +10:00
Rafael Schouten
096324cf5e
bugfix filters
2014-09-25 13:46:08 +10:00
Rafael Schouten
0e2774882f
dry enterprise angular
2014-09-25 13:06:02 +10:00
Rob Harrington
f5849e91dc
Adding limit reached modal to registration
2014-09-25 12:25:32 +10:00
Rob Harrington
6fa7d9cbcb
Registration controller checks number of owned enterpises
2014-09-25 12:10:45 +10:00
Rob Harrington
9520eeeb15
can specify attributes for create_enterpise_user
2014-09-25 11:56:18 +10:00
Rafael Schouten
3775cd29cb
generalise search filter to any enterprise
2014-09-25 11:34:49 +10:00
Rafael Schouten
da620f3723
Merge branch 'master' into ent_types_frontend
2014-09-25 10:09:42 +10:00
Rafael Schouten
f8d5b7ede8
refactor enterprise types to six options
2014-09-24 23:30:43 +10:00
Rob Harrington
ed91cd6463
Make sure d1 != d2
2014-09-24 20:48:52 +10:00
Rafael Schouten
a058af8211
open products in new tab
2014-09-24 17:00:12 +10:00
Rafael Schouten
139da3ac7a
outline inputs with errors
2014-09-24 16:59:57 +10:00
Rob Harrington
b5ef24bacb
table matchers use capybara matchers rather than wait_until with micro-sleep
2014-09-24 16:18:59 +10:00
Rob Harrington
f0f165a129
Explicitly create enterprises in order_cycle factory to fix intermittent fail
2014-09-24 14:00:08 +10:00
Rob Harrington
1a86206e1f
Fixing super annoying server reload bug
2014-09-24 13:01:40 +10:00
Rob Harrington
c6d463bf25
Revert "Pending bulk order mgmt specs"
...
This reverts commit eead8d665f .
2014-09-20 18:06:42 +10:00
Rob Harrington
b86848269b
Merge branch 'specs' into reg_images
2014-09-19 23:44:31 +10:00
Rob Harrington
5bceb81479
Fixing image upload in onboarding
2014-09-19 23:37:02 +10:00
Rob Harrington
509cf6250a
Explicitly sort managed products
2014-09-19 18:32:03 +10:00
Rob Harrington
07275574b6
Manager can't bulk update owner
2014-09-19 18:31:50 +10:00
Rob Harrington
5d2d619d66
Assigning @spree_api_key for store
2014-09-19 18:31:33 +10:00
Rob Harrington
17ce80a417
Allow new user to create enterprises
2014-09-19 18:31:23 +10:00
summerscope
d86c3cff26
Making enterprise header styles show as turquoise when no shopfront to click through to
2014-09-19 17:48:24 +10:00
summerscope
5e4e939087
Return template markup which was accidentally removed in Rafs merge
2014-09-19 17:47:49 +10:00
Rafael Schouten
559d3b0e4b
fixup the header but needs some styling
2014-09-19 17:24:41 +10:00
Rafael Schouten
883e5f1095
Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend
...
Conflicts:
app/assets/javascripts/templates/partials/enterprise_header.html.haml
2014-09-19 17:22:29 +10:00
Rafael Schouten
abc5a215a2
add map modals, profile filters and bugfixes
2014-09-19 17:07:07 +10:00
summerscope
919f87df58
change modal styling to improve look of Close button, overall layout for modals
2014-09-19 16:46:19 +10:00
Rafael Schouten
cf13115d57
bugfix is_profile bool
2014-09-19 16:44:51 +10:00
summerscope
408f7b7f10
Modals styling refine for small use cases
2014-09-19 16:44:43 +10:00
Rafael Schouten
e4991d4528
reorganise and document enterprise categories
2014-09-19 16:44:28 +10:00
summerscope
09cc3c6285
Styling for hero image underlay used on enterprises- adjust min heights for different text use cases
2014-09-19 16:44:16 +10:00
summerscope
5a7175e75d
Tweak markup to make modals fit headers nicely across small sizes
2014-09-19 16:43:31 +10:00
summerscope
1c0196cf5d
Change language for Kirsten
2014-09-19 16:25:34 +10:00
Rob Harrington
c6acbc6810
Assigning @spree_api_key for store
2014-09-19 16:09:26 +10:00
Rob Harrington
eeb54f3f76
Allow new user to create enterprises
2014-09-19 15:30:53 +10:00
summerscope
4c7fa4eb9f
Fix markup so that text is not nested inside icon markup
2014-09-19 15:19:47 +10:00
summerscope
e5fc3c19e3
Working on refining scroll on modals
2014-09-19 14:41:45 +10:00
Rob Harrington
544e6e074a
Stop being lazy
2014-09-19 14:38:59 +10:00
Rob Harrington
d3e72b5a2a
Adding images to registration process
2014-09-19 12:41:24 +10:00
Rafael Schouten
f9cbdcee0a
swap profile name
2014-09-19 12:18:02 +10:00
Rafael Schouten
527a139f72
Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend
2014-09-18 18:17:41 +10:00
Rafael Schouten
64fdbcf04f
update enterprise type spec
2014-09-18 18:17:31 +10:00
Rafael Schouten
0d5106d571
refactor enterprise type logic and fix icons
2014-09-18 18:15:28 +10:00
summerscope
9a4ba5aa1f
Producer page styling and logic for markup
2014-09-18 16:15:14 +10:00
summerscope
e1769e638d
More styling for producer page
2014-09-18 16:14:53 +10:00
summerscope
24ca1b064a
Tweak language for help popover
2014-09-18 15:34:56 +10:00
summerscope
0b59ca2dc1
Turning Show Profiles checkbox back on ready for logic
2014-09-18 15:33:44 +10:00
summerscope
7f4bccc956
fix anchor angular for link to hub shopfront
2014-09-18 15:22:53 +10:00
summerscope
20a76626b9
Add styling for instance where producer is own shopwfront on producer page
2014-09-18 15:22:29 +10:00
Rafael Schouten
1fdcbbec40
Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend
2014-09-18 15:15:01 +10:00
Rafael Schouten
bd922085c4
icons and entity category logic
2014-09-18 15:14:55 +10:00
summerscope
c42f83b6b1
Tweak markup to show producer name and write logic for link around producer if also own shopfront
2014-09-18 15:13:48 +10:00
Rafael Schouten
d75076e1c9
producer icons and inital link logic
2014-09-18 13:59:47 +10:00
Rafael Schouten
21628ed069
Merge branch 'master' into ent_types_frontend2
2014-09-17 17:45:55 +10:00
Rafael Schouten
e9dd863462
Merge branch 'master' into payment_description
...
Conflicts:
app/views/spree/order_mailer/confirm_email.text.erb
2014-09-17 17:07:43 +10:00
Rafael Schouten
83b19ee632
fix haml and formatting on confirm email
2014-09-17 16:56:44 +10:00
Rafael Schouten
79fd8ed98b
dubug mail template
2014-09-17 15:37:38 +10:00
Rafael Schouten
e618c4c2c0
add payment description to checkout
2014-09-17 14:56:29 +10:00
rafaqz
ee6b71b140
Merge pull request #260 from openfoodfoundation/currency
...
Merge Currency branch
2014-09-17 13:47:37 +10:00
Rafael Schouten
1c9bb906d1
Merge branch 'currency' of https://github.com/openfoodfoundation/openfoodnetwork into currency
2014-09-17 13:21:56 +10:00
Rafael Schouten
ac3c3f9f6c
remove to_f on decimals
2014-09-17 13:19:34 +10:00
Rafael Schouten
6829636f11
comit ng-tst changes elsewhere
2014-09-17 13:19:08 +10:00
rafaqz
98ba135d49
Explain weird spree override
2014-09-17 13:12:27 +10:00
Rafael Schouten
4a93e9e94f
Merge branch 'master' into currency
2014-09-17 12:49:10 +10:00
Rafael Schouten
a5680e611e
add example yml
2014-09-17 12:05:28 +10:00
Rafael Schouten
b6fd3a11fa
remove old mailer
2014-09-17 11:54:06 +10:00
Rafael Schouten
f79dfed6ef
use haml for mailer
2014-09-17 11:53:47 +10:00
Rob Harrington
0fdbcc0023
Make dates consistent
2014-09-17 11:39:39 +10:00
Rob Harrington
eead8d665f
Pending bulk order mgmt specs
2014-09-17 11:39:20 +10:00
Rafael Schouten
01c98bf6e4
refactor and bugfix for tests
2014-09-17 01:07:34 +10:00
Rob Harrington
22e61d9834
TEMP: spit out variables in failing oc spec
2014-09-16 23:47:34 +10:00
Rob Harrington
279c5925ef
Add helpers to registration spec to counter JS weirdness
2014-09-16 23:46:34 +10:00
Rob Harrington
9e2e96d19e
Schema weirdness
2014-09-16 23:45:36 +10:00
Rafael Schouten
49476b17e8
fix typos and add missing helper
2014-09-16 16:10:48 +10:00
Rafael Schouten
1aa80e53b1
Merge branch 'master' into currency
...
Conflicts:
app/helpers/injection_helper.rb
db/suburb_seeds.rb
2014-09-16 10:25:22 +10:00
Rafael Schouten
15bfe75313
ifnore figaro
2014-09-16 00:21:10 +10:00
Rafael Schouten
9448e1cbe4
add figaro env config
2014-09-16 00:13:43 +10:00
Rafael Schouten
5cf09d264c
fix suburb typo
2014-09-14 12:27:24 +10:00
Rob H
143545da0d
Try newer syntax to fix spec failing on CI
2014-09-12 23:41:26 +10:00
Rob H
0815775bc3
Temporary fix for race condition in registration spec
2014-09-12 17:22:54 +10:00
Rob H
30bcdde5ca
Merge branch 'ent_types_frontend' into working
2014-09-12 16:45:58 +10:00
Rob H
cb7033eea0
Registration spec checks enterprise created and updated
2014-09-12 16:42:10 +10:00
Rohan Mitchell
25a889375c
Fix unreliable spec
2014-09-12 16:39:47 +10:00
Rohan Mitchell
b41029d5d0
Spec reliability: Explicitly set a $0 calculator for shipping method
2014-09-12 16:11:31 +10:00
Rob H
d2c5533549
Remove use_short_wait
2014-09-12 16:10:38 +10:00
summerscope
cc9d2ebbac
Modal styling fixes for scrolling on mobile view
2014-09-12 16:01:25 +10:00
summerscope
799bfae6e4
Revert "Add commented-out scrolling code. Return false from click handlers."
...
This reverts commit dbefd43f07 .
2014-09-12 15:51:20 +10:00
summerscope
c365047d0c
Short description goes back in producer fat view until we can clean up the HTML formatting
2014-09-12 15:40:12 +10:00
Rohan Mitchell
dbefd43f07
Add commented-out scrolling code. Return false from click handlers.
2014-09-12 15:33:02 +10:00
Rob H
8507690865
Fixing enterprise owner migration
2014-09-12 15:23:13 +10:00
summerscope
42fccd1bdf
Merging master into my branch to make it up to date
2014-09-12 14:48:19 +10:00
summerscope
3cff83b7a5
Kill the outside modal close button styling once and for all
2014-09-12 14:42:58 +10:00
Rob H
05d8c825c7
Enterprise User should NOT see form elements for changing type
2014-09-12 13:40:47 +10:00
summerscope
0dd33e6635
Modal styling updates ated trying to fix mobile scrolling issue. getting there.
2014-09-12 13:40:00 +10:00
Rob H
bcca8c5c0d
Merging master into all the things
2014-09-12 13:28:30 +10:00
Rob H
f5048ecf7c
Sends confirmation email when Enterprise is created
2014-09-12 13:24:17 +10:00
Rohan Mitchell
4fb30f2942
When removing outgoing exchanges, do not removing variants from other outgoing exchanges
2014-09-12 12:50:04 +10:00
Rob H
5c7ab2efa3
Restrict editing of ownership and type in enterprise api controller
2014-09-12 12:47:16 +10:00
Rafael Schouten
9a1b524915
fix icon font class
2014-09-12 12:21:40 +10:00
Rob H
cc65faadd0
Specing out enterprise registration service properly
2014-09-12 11:48:17 +10:00
summerscope
a28eaba31a
Turn off price graph pop overs for small devices
2014-09-12 11:45:13 +10:00
Rohan Mitchell
e50bbeaefb
Edit product form shows permitted suppliers
2014-09-12 11:33:47 +10:00
summerscope
1c5a495d5c
Making icons smaller, adding a bit of background shadow to pop them out
2014-09-12 11:29:41 +10:00
Rohan Mitchell
a6556f3a4f
Fix broken JS specs
2014-09-12 11:12:35 +10:00
Rohan Mitchell
033fe88513
New product form shows permitted suppliers
2014-09-12 11:07:59 +10:00
summerscope
bfa71942fe
Tweaks to input placeholder label
2014-09-12 11:02:28 +10:00
summerscope
01397b2e49
Tweaks to filter box
2014-09-12 11:01:35 +10:00
Rob H
6ee3010fa7
Differentiation of on-boarding process by url
2014-09-12 11:00:34 +10:00
summerscope
ecacde41dd
Tweaks to big input for small screens
2014-09-12 11:00:10 +10:00
summerscope
126e9e82a6
Add in blues for use
2014-09-12 10:58:51 +10:00
summerscope
9c33be911c
Update placeholder label
2014-09-12 10:49:59 +10:00
summerscope
6d7fd6dc94
Add in logic to change right hand label if this is the current hub
2014-09-12 10:48:33 +10:00
Rafael Schouten
309ddece89
make profile icons work
2014-09-12 10:38:04 +10:00
Rafael Schouten
3ea29df111
12 option entity categories
2014-09-12 10:11:59 +10:00
Rafael Schouten
05782b6ec1
Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend
2014-09-12 09:59:55 +10:00
Rafael Schouten
f33a9e1a58
16 enterprise categories from four checks.
2014-09-12 01:50:36 +10:00
Rob H
043cc915e7
Removing save_screenshot calls
2014-09-11 22:40:03 +10:00
Rob H
5007fd8ec3
Shipping method 1 is used, so shipping method amount is zero
2014-09-11 22:27:05 +10:00
Rob H
a7a99b5048
Pending registration spec
2014-09-11 18:15:33 +10:00
Rob H
12f5e48479
Replace is not with isnt - damn you CoffeeScript
2014-09-11 17:58:38 +10:00
Rob H
98f7e58f9d
Registration spec expects the correct url
2014-09-11 17:58:05 +10:00
summerscope
de64a5154b
Fixing markup icon class name was incorrect
2014-09-11 17:13:07 +10:00
Rob H
048a741a2c
Plugging final two registration pages into validation
2014-09-11 17:11:53 +10:00
Rob H
19565a5f3b
Rename service
2014-09-11 17:10:59 +10:00
Rob H
fc0afae51c
Adding form validation to contact page
2014-09-11 17:10:59 +10:00
Rob H
454e4c971a
Adding validation to address page
2014-09-11 17:10:59 +10:00
Rob H
34841f8543
Refactoring registration form controller
2014-09-11 17:10:59 +10:00
Rob H
412e906ed3
Adding basic validation to reg process
2014-09-11 17:10:59 +10:00
Rob H
800eecea33
Fix failing bulk specs
2014-09-11 17:10:58 +10:00
summerscope
8d570286a1
Adding in sexy logic to add color to name depending on type
2014-09-11 17:10:58 +10:00
summerscope
f8c761f492
Comment out unused section, set column layout to match previous step
2014-09-11 17:10:58 +10:00
summerscope
e0fff552f9
Adjust button layout at bottom of page
2014-09-11 17:10:58 +10:00
summerscope
4d8796669b
Adding in pretty alert boxes, yay!
2014-09-11 17:10:58 +10:00
summerscope
dc5506d06b
Adjust button layout at bottom of page
2014-09-11 17:10:58 +10:00
summerscope
100d672eef
Adjust button layout at bottom of page
2014-09-11 17:10:58 +10:00
summerscope
6486e41576
More styling for registration
2014-09-11 17:10:08 +10:00
summerscope
a5fefbe6bb
More styling for register form
2014-09-11 17:10:07 +10:00
summerscope
912b7a8f95
Add a color class for global use
2014-09-11 17:10:07 +10:00
summerscope
75c62a7cb8
Markup changes to step 2 address
2014-09-11 17:10:07 +10:00
summerscope
2917c0fa44
More styling and work on step 1 - DETAILS
2014-09-11 17:10:07 +10:00
Rob H
c93673d78b
Adding form to each page of registration
2014-09-11 17:10:07 +10:00
summerscope
c54b18a416
Cleanupm markup
2014-09-11 17:07:07 +10:00
summerscope
8a4dcef7fe
Tweak layout and simplify column structures
2014-09-11 17:07:07 +10:00
summerscope
500cb65b41
Styling for registration steps
2014-09-11 17:07:07 +10:00
summerscope
d1b8b12901
Tweak custom bullet point styles
2014-09-11 17:07:07 +10:00
Rob H
a16da4eae0
Commenting out enterprise creation
2014-09-11 17:07:07 +10:00
Rob H
f1ef8ba3c7
Getting signup to work and authentication to load in reg specific template
2014-09-11 17:07:07 +10:00
summerscope
8b928b5a66
Styling on-boarding wizard Introduction step
2014-09-11 17:07:06 +10:00
summerscope
08d3eb6f93
Making the modals higher relative to their respective window
2014-09-11 17:07:06 +10:00
summerscope
36f719d538
Creating new style of bullet point list
2014-09-11 17:07:06 +10:00
summerscope
db58fb5b0c
Pretty potatoes picture for creating profile wizard
2014-09-11 17:07:06 +10:00
Rob H
f1f9a2e7fc
Updating on later pages of registration process
2014-09-11 17:07:06 +10:00
summerscope
60d6599f9b
Tweak chirpy message in view
2014-09-11 17:07:06 +10:00
Rob H
dc43612a04
Adding an 'r'
2014-09-11 17:07:06 +10:00
Rob H
bc0c9dd229
Adding the social page to registration form
2014-09-11 17:07:06 +10:00
Rob H
b848d583ff
Adding the remainder of pages to registration process
2014-09-11 17:07:05 +10:00
Rob H
e341b12d3a
Adding loading message when creating enterprise
2014-09-11 17:07:05 +10:00
Rob H
4d106129ee
Creating an about page including flash boxes for registration
2014-09-11 17:07:05 +10:00
Rob H
69b1d14cc4
Adding authorize to api enterprise create
2014-09-11 17:07:05 +10:00
Rob H
ef8f611458
Adding countries and states to registration
2014-09-11 17:07:05 +10:00
Rob H
7dc42c9e39
Creating an enterprise works in registration process
2014-09-11 17:07:05 +10:00
Rob H
3d4e00a03c
Swtich API key injection over to helper
2014-09-11 17:07:05 +10:00
summerscope
a642ad0855
More style detail for small view inactive hub small views
2014-09-11 17:00:59 +10:00
Rob H
10f97fe14b
Adding some icons to registration pages
2014-09-11 16:34:21 +10:00
Rob H
07f9dc23e0
Making button styling a bit nicer
2014-09-11 16:34:21 +10:00
Rob H
29e78e63ad
Playing with resizing
2014-09-11 16:34:20 +10:00
Rob H
95bfc74b3f
No need to deal with locations in registration
2014-09-11 16:34:20 +10:00
Rob H
e1400705fe
Adding contact step to registration process
2014-09-11 16:34:20 +10:00
Rob H
843c6ea6a6
Fix styling on details page
2014-09-11 16:34:20 +10:00
Rob H
c53df00969
Adding address step to registration process
2014-09-11 16:34:20 +10:00
Rob H
5f09f1b4f7
Pull out styling for registration process
2014-09-11 16:34:20 +10:00
Rob H
c92aa41e28
Adding introduction and details pages to registration process
2014-09-11 16:34:19 +10:00
Rob H
595aa760cb
Loads registration page with authentication
2014-09-11 16:34:19 +10:00
summerscope
94165f17e4
Merging master into this branch to keep repository up to date
2014-09-11 16:33:44 +10:00
summerscope
24507c6c0a
turn off Profile filter again until ready to support this
2014-09-11 16:29:38 +10:00
summerscope
1eef483c44
Hub node styling for different use cases of active / inactive / current / open / closed
2014-09-11 15:42:37 +10:00
summerscope
af064a3fc7
Adding more spacing for fat view on small devices - vertical spacing for each chunk
2014-09-11 15:42:08 +10:00
summerscope
de7837aea9
New greys and translucent colors for global use
2014-09-11 15:41:28 +10:00
summerscope
7d0cf2ace9
Adding rounded corners to producers nodes for active table
2014-09-11 15:41:01 +10:00
summerscope
71918539b8
Undo changing name Hubs to Shops, for the moment
2014-09-11 15:40:35 +10:00
summerscope
16ad465571
tweak placeholder name
2014-09-11 15:40:12 +10:00
Rob H
ad56594fe9
Removing obsolete spec
2014-09-11 15:19:24 +10:00
Rob H
c0e4a22a6e
Adding enterprise_limit form element to user edit page
2014-09-11 15:19:24 +10:00
Rob H
7780046d71
Clicking on user email takes me to the edit page rather than the annoying 'show' intermediary
2014-09-11 15:19:24 +10:00
Rob H
a3f7fc1202
Adding column for enterprise limit on users index page
2014-09-11 15:19:23 +10:00
Rob H
9085741f3c
Removing enterprises form from user edit page
2014-09-11 15:19:23 +10:00
Rob H
8cc5c2246a
Hide 'Create New' enterprise link on dashboard when user has reached limit
2014-09-11 15:19:23 +10:00
Rob H
eb6af408d7
Trailing spaces crusader: one man, a million trailing spaces
2014-09-11 15:19:23 +10:00
Rob H
60297eb5c8
Hide 'New Enterprise' link on index page when user has reached limit
2014-09-11 15:19:23 +10:00
Rob H
41b286f80f
Delete specific E2ER in spec
2014-09-11 14:54:51 +10:00
Rob H
f1c19ea64c
Enterprise validates owner enterprise_limit
2014-09-11 14:54:51 +10:00
Rob H
7fbc9aa680
User validates the number of enterprises owned
2014-09-11 14:54:51 +10:00
Rob H
2253859cd1
Adding enterprise limit to spree users
2014-09-11 14:54:51 +10:00
Rob H
e83e2295ed
Adding some extra controller-level specs for enterprise ownership
2014-09-11 14:54:51 +10:00
Rob H
3e1f4628e3
Can change owner of enterprises from index page
2014-09-11 14:51:22 +10:00
Rob H
7983b2f45a
Adding changing ownership to enterprise update spec
2014-09-11 14:39:15 +10:00
Rob H
e106c7a0cd
Initialise user autocomplete element using data from element itself rather than AJAX request
2014-09-11 14:39:15 +10:00
Rob H
13d814ff23
Adding user autocomplete directive to speed up specification of owner for enterprises
2014-09-11 14:39:15 +10:00
Rob H
73a32fdaf1
Remove distributor_info: 'how does it work' from enterprises edit page
2014-09-11 14:39:14 +10:00
Rob H
8e91e4513d
Remove rich text editors from about us in enterprise editor
2014-09-11 14:39:14 +10:00
Rob H
4bde6a0a3d
WIP: VERY SLOW PAGE LOAD: Super admin can edit owner of enterprise from edit screen
2014-09-11 14:39:14 +10:00
Rob H
138e0281a3
Specify owner for enterprise create action
2014-09-11 14:39:14 +10:00
Rob H
31de5d45ea
Adding owner to enterprise
2014-09-11 14:36:09 +10:00
Rob H
58f28f112a
Enterprise index type selection is only visible to super admin
2014-09-11 14:22:47 +10:00
summerscope
997479f5be
Change label on mobile menu
2014-09-11 13:05:21 +10:00
Rafael Schouten
0fa4540cec
Merge branch 'master' into currency
2014-09-11 12:09:18 +10:00
summerscope
bebe0c41f6
Styling for hubs and producers - adding rounded corners, making current shop less intense
2014-09-11 11:50:46 +10:00
Rafael Schouten
09a4c4e17e
add spree currency helper, fix some typos and specs
2014-09-11 11:47:55 +10:00
Rafael Schouten
c1971d015c
fix bug in mailer
2014-09-10 19:59:39 +10:00
Rafael Schouten
666036756e
fixup docs etc
2014-09-10 19:50:32 +10:00
Rafael Schouten
dc266e066f
another few class names
2014-09-10 19:43:14 +10:00
Rafael Schouten
44e9cf5ade
add currency spec file and update some class names
2014-09-10 18:22:33 +10:00
Rohan Mitchell
69d1111c73
Fix expected payment amount
2014-09-10 17:00:51 +10:00
Rohan Mitchell
32a2e793ad
When deleting enterprise relationships, delete dependent permissions
2014-09-10 14:49:15 +10:00
Rohan Mitchell
c297b7014a
Charge customers for their shipping fee
2014-09-10 14:01:36 +10:00
Rohan Mitchell
4168ea054b
For body content, cloak the home page only. JS should be cached after that.
2014-09-10 12:12:46 +10:00
Rohan Mitchell
b49eb8fe03
Hide angular templates on page load
2014-09-10 11:50:30 +10:00
Rob H
78a70292ac
Moved attributes are actually delcared in the right place for Enterprise Serializer
2014-09-08 15:39:17 +10:00
Rob H
dfa837cac6
Moved cached properties which should not be cached
2014-09-08 15:01:34 +10:00
Rob H
b49a4cbc4f
Fix intermittent failing spec
2014-09-08 11:11:07 +10:00
Rob H
3ee0cf46e0
Merge branch 'working' into merging
2014-09-08 10:12:31 +10:00
Rob H
36891c73cb
Merge branch 'master' into merging
2014-09-08 10:09:51 +10:00
Rob H
a968aa9b91
Removing float:left which weirdly breaks specs
2014-09-08 10:09:00 +10:00
Rafael Schouten
991d0029dd
add currency localisation
2014-09-08 00:06:53 +10:00
Rob H
5fb4110328
Adding distributor and producer checkboxes to enterprise index
2014-09-07 21:04:53 +10:00
Rob H
6540bb8efc
Adding select field for enterprise type to index when super admin
2014-09-07 19:51:14 +10:00
Rob H
b8fadb50ae
Special Instructions in checkout are actually wired up
2014-09-06 12:00:27 +10:00
Rob H
9dc2b248c7
Bulk management permissions make more sense
2014-09-06 09:37:34 +10:00
Rob H
ee4a1925fe
Bulk Order Management works with navigation helper override
2014-09-06 00:34:27 +10:00
Rob H
780df6bfe0
Hide 'profile type' form element for non super-admin users
2014-09-05 18:38:43 +10:00
Rob H
58dcdbd9c4
Restricting ability to change enterprise type at the controller level
2014-09-05 18:30:15 +10:00
summerscope
2e8ec3df18
Tweak placeholder messages for big inputs
2014-09-05 18:07:50 +10:00
summerscope
6271b83fad
Tweak placeholder messages for big inputs
2014-09-05 18:07:28 +10:00
summerscope
778cf0326b
Changing placeholder for
2014-09-05 18:04:02 +10:00
summerscope
94e3946d52
producer list view styling
2014-09-05 17:54:16 +10:00
summerscope
0b74242f49
make classes more generic for more use-cases
2014-09-05 17:53:52 +10:00
summerscope
bb82fc4b20
move generic things into active table
2014-09-05 17:53:27 +10:00
summerscope
6e10c416e2
hub view styling
2014-09-05 17:53:14 +10:00
summerscope
ab44046658
skinny view producers remove unnecessary spacer element
2014-09-05 17:52:36 +10:00
summerscope
a9619a6dca
Changes to markup on producer page to adjust layout
2014-09-05 17:50:50 +10:00
Rob H
20bfcd6e48
Switching enterprise relationships form around
2014-09-05 17:11:57 +10:00
summerscope
60ac3f29a5
Producers page WIP
2014-09-05 16:41:00 +10:00
summerscope
adb8b6b02f
Styling for help icon
2014-09-05 16:40:59 +10:00
summerscope
b3f97479d3
Hide profile filter from search for the mo
2014-09-05 16:40:59 +10:00
Rob H
097367a9f8
Map modals for 'profile' enterprises do not display shopping options
2014-09-05 16:28:08 +10:00
Rob H
1e1ddedfb2
Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend
2014-09-05 16:18:45 +10:00
Rob H
428e4c63d4
Profile hubs don't show up in hubs list
2014-09-05 16:18:25 +10:00
summerscope
0d0ffa1cd0
Making CTA links consistent with modals, adding in logic to force space holding for producer fat view
2014-09-05 15:47:41 +10:00
summerscope
a092e97294
Adding a little bit of spacing between each row for active table
2014-09-05 15:47:14 +10:00
summerscope
26bd1000de
Changing placeholder for search input
2014-09-05 15:28:50 +10:00
summerscope
59adae5c9c
Working on space placeholders for fat view
2014-09-05 15:28:32 +10:00
Rob H
233532a85f
Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend
2014-09-05 15:14:48 +10:00
summerscope
99fb9c1966
Adding in markup and styling for new layout of hubs list view
2014-09-05 15:10:17 +10:00
Rohan Mitchell
3a12f9a7c8
Extract bulk product edit interface into partials
2014-09-05 15:10:17 +10:00
Rohan Mitchell
4d766a29ab
Convert admin login nav to haml
2014-09-05 15:10:16 +10:00
Rohan Mitchell
c43c35601b
Set product.largeImage in JS, use for product modal
2014-09-05 15:10:16 +10:00
Rohan Mitchell
fe1c60ba47
Enterprise manager can edit products from enterprises it has manage_products permission on
2014-09-05 15:10:16 +10:00
Rohan Mitchell
b7708d750b
Check authorisation for bulk update products
2014-09-05 15:10:15 +10:00
Rohan Mitchell
fbd4f98fa9
Include producers I have permission to in BPE producers choice
2014-09-05 15:10:15 +10:00
Rohan Mitchell
9ec5dc6466
Find enterprises that we manage products for
2014-09-05 15:10:14 +10:00
Rohan Mitchell
e023a66167
Bulk product edit lists managed products
2014-09-05 15:10:14 +10:00
Rohan Mitchell
4af704b1d0
Fetch managed products via OpenFoodNetwork::Permissions
2014-09-05 15:10:14 +10:00
Rohan Mitchell
1ea63bca6e
Name test enterprises semantically
2014-09-05 15:10:14 +10:00
digital dreamer
503fb53750
Fix #242 - foreign key constraint error on load_sample_data
2014-09-05 15:10:14 +10:00
Rohan Mitchell
6ff6e4248c
Rename spec to match view name change
2014-09-05 15:10:14 +10:00
Rohan Mitchell
57af658e7c
For OC, fetch all enterprises we have access to, including those via E2E relationships
2014-09-05 15:10:13 +10:00
Rohan Mitchell
913c167fdf
Revert 5ede8d1, reinstating a4be0ff..7b89e6a
2014-09-05 15:10:12 +10:00
Maikel Linke
7603ea867f
Store links to root_path instead of product_path
2014-09-05 15:10:12 +10:00
Maikel Linke
c5cfda5283
Adding login_nav partial from spree_auth_devise
...
Preparing to change 'Store' link for Bugherd #443 .
2014-09-05 15:10:12 +10:00
Maikel Linke
aaa32528ea
Giving an example name for an enterprise fee.
...
The example is displayed as input placeholder. See bugherd #439 .
2014-09-05 15:10:11 +10:00
Maikel Linke
602dfbe002
ng_text_field handling options parameter
2014-09-05 15:10:10 +10:00
Rob H
14aada1808
Add 'profile only' logic to maps icons
2014-09-05 15:09:15 +10:00
Rob H
32ee8afdce
logic for producer shop icon in list view
2014-09-05 14:46:04 +10:00
summerscope
7b9ff9b6dd
Merge branch 'ent_types_frontend' of github.com:openfoodfoundation/openfoodnetwork into ent_types_frontend
...
Conflicts:
app/views/home/_skinny.html.haml
2014-09-05 12:48:05 +10:00
summerscope
658c27408e
Styling for hub listing page and tweaks to markup to accomodate new icons and styling
2014-09-05 12:32:45 +10:00
Rob H
8f6d04a129
Adding properties to enterprise serialiser to allow differentiation between profile, shopfront and aggregators
2014-09-05 12:30:52 +10:00
summerscope
b487c9848b
Add checkbox for show / hide profiles
2014-09-05 12:15:14 +10:00
summerscope
94fbb624f5
Make CTA links separate from hub link styling
2014-09-05 12:14:55 +10:00
summerscope
ed0f2de2f3
More styling for CTA links on modals
2014-09-05 11:56:21 +10:00
summerscope
c64ef39e22
Ran a DB:micrate, this is a change to the order
2014-09-05 11:39:43 +10:00
summerscope
0138fded17
Styling for modals
2014-09-05 11:39:04 +10:00
summerscope
116eb6a2c6
template updates for modals - links not buttons
2014-09-05 11:38:19 +10:00
Rohan Mitchell
0fd496aa97
Extract bulk product edit interface into partials
2014-09-02 15:27:51 +10:00
Rohan Mitchell
4d57a73ee3
Merge branch 'digital-dreamer-fix-242-foreign-key'
2014-09-02 14:08:45 +10:00
Rohan Mitchell
7d6dbeba28
Merge branch 'fix-242-foreign-key' of https://github.com/digital-dreamer/openfoodnetwork into digital-dreamer-fix-242-foreign-key
2014-09-02 14:02:14 +10:00
Rohan Mitchell
f53ed4bf31
Merge branch 'admin-panel-store-link'
2014-09-02 13:45:25 +10:00
Rohan Mitchell
818a0f8595
Convert admin login nav to haml
2014-09-02 13:45:11 +10:00
Rohan Mitchell
a347152490
Merge branch 'master' into admin-panel-store-link
2014-09-02 13:39:46 +10:00
Rohan Mitchell
fce2147dc1
Merge branch 'enterprise-fee-naming-example'
2014-09-02 13:39:11 +10:00
Rohan Mitchell
7247e65115
Merge branch 'master' into enterprise-fee-naming-example
2014-09-02 13:36:50 +10:00
Rohan Mitchell
2cd5afbf9c
Set product.largeImage in JS, use for product modal
2014-09-01 16:21:23 +10:00
Rohan Mitchell
e72c3d861b
Enterprise manager can edit products from enterprises it has manage_products permission on
2014-09-01 11:49:09 +10:00
Rohan Mitchell
94683f1eaa
Check authorisation for bulk update products
2014-09-01 11:15:00 +10:00
Rohan Mitchell
c81503d95f
Include producers I have permission to in BPE producers choice
2014-09-01 10:44:09 +10:00
Rohan Mitchell
4d8d74dec7
Find enterprises that we manage products for
2014-09-01 10:36:59 +10:00
Rohan Mitchell
cfb31b46e4
Bulk product edit lists managed products
2014-09-01 10:13:59 +10:00
Rohan Mitchell
e0645dfbd9
Fetch managed products via OpenFoodNetwork::Permissions
2014-09-01 09:42:50 +10:00
Rohan Mitchell
66f20a6b8a
Name test enterprises semantically
2014-09-01 09:17:38 +10:00
digital dreamer
ac48613556
Fix #242 - foreign key constraint error on load_sample_data
2014-08-29 13:42:27 +02:00
summerscope
a4aa949499
Applying new icons for map view
2014-08-29 18:04:06 +10:00
summerscope
ae442769b5
New version of icon font for OFN system
2014-08-29 18:03:47 +10:00
summerscope
a31e8ff82f
New map icons
2014-08-29 18:03:15 +10:00
summerscope
4efe3fdf88
Remove old map icons
2014-08-29 18:01:54 +10:00
Rohan Mitchell
62e6cacfd0
Rename spec to match view name change
2014-08-29 17:37:56 +10:00
Rohan Mitchell
7f74854a2f
For OC, fetch all enterprises we have access to, including those via E2E relationships
2014-08-29 16:38:23 +10:00
Rohan Mitchell
0b61872d96
Revert 5ede8d1, reinstating a4be0ff..7b89e6a
2014-08-29 16:38:10 +10:00
Maikel Linke
ef639b9535
Adjusting columns for 16 column layout.
...
Removed the 1col spacer column and extended the fieldsets to 12col.
2014-08-28 17:06:26 +10:00
Maikel Linke
a379f88add
making asterisk 10% bigger
2014-08-28 16:41:10 +10:00
Maikel Linke
a0d6ec988e
make asterisk red
2014-08-28 16:38:44 +10:00
Maikel Linke
8da98ce19c
Adding asterisks to required fields.
...
Addressing BugHerd #454 .
2014-08-28 16:26:30 +10:00
Rob H
ba3f97ca1f
Fixing enterprise relationships spec
2014-08-28 14:45:24 +10:00
Rob H
5ede8d169f
Revert a4be0ff..7b89e6a for deployment
2014-08-28 14:32:57 +10:00
Rob H
bfd9ffd84a
Adding missing data-bindings for country/state
2014-08-28 14:25:21 +10:00
Rohan Mitchell
7b89e6aa80
Revert "Comment out ERPs which have confusing names, use old 'permits'"
...
This reverts commit a4be0ff55a .
2014-08-28 10:12:06 +10:00
Rohan Mitchell
1871d42e68
Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page
2014-08-28 10:09:50 +10:00
Rohan Mitchell
a5debc19dc
Permit edits to exchanges involving enterprises permitted via E2E relationships
2014-08-28 10:09:50 +10:00
Rohan Mitchell
628d87b69a
Add to OC permission allows adding distributors to order cycle
2014-08-28 10:09:50 +10:00
Rohan Mitchell
5ef13d3c5a
Change 'add products to OC' permission into the more general 'add enterprise to OC'
2014-08-28 10:09:50 +10:00
Rohan Mitchell
099a5b0b7b
Show E2E related enterprise exchanges in OC
2014-08-28 10:09:50 +10:00
Rohan Mitchell
34602244ca
Show permitted suppliers in order cycle add supplier select box
2014-08-28 10:09:50 +10:00
Rohan Mitchell
b9e5821497
Add EnterpriseRelationship scopes permitting and with_permission
2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e
Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class
2014-08-28 10:09:50 +10:00
Rohan Mitchell
a7689973be
Semantically name enterprises in spec
2014-08-28 10:09:50 +10:00
Rohan Mitchell
5e8bdce67d
Refactor spec
2014-08-28 10:09:50 +10:00
Rob H
a4be0ff55a
Comment out ERPs which have confusing names, use old 'permits'
2014-08-27 17:07:30 +10:00
Rob H
7124dc57fd
Requiring a state in checkout
2014-08-27 16:59:26 +10:00
Rob H
400f2ea9b9
Don't add payment forms to checkout DOM unless required
2014-08-27 15:09:41 +10:00
Rohan Mitchell
0462b3e55d
Prevent duplicate enterprise roles
2014-08-26 14:40:34 +10:00
Rob H
435819acc4
Removing unit text from total units column
2014-08-25 20:29:24 +10:00
Rob H
310d1b3726
Zeus server does not crash when editing controllers
2014-08-25 20:29:24 +10:00
Rob H
0d9e07d484
Make restore script compatible with OSX
2014-08-25 20:29:23 +10:00
Rohan Mitchell
45a44844ca
Remove old rabl spec
2014-08-25 16:38:17 +10:00
Rohan Mitchell
1a995aedda
Simplify enterprise_relationship factory - leverage permissions_list= model method
2014-08-25 15:20:46 +10:00
Rohan Mitchell
c3224ce668
Style permission list items, order perms consistently by name
2014-08-25 15:05:49 +10:00
Rohan Mitchell
3932884dba
Admin can create enterprise relationships with permissions
2014-08-25 14:59:10 +10:00
Rohan Mitchell
057ad9c6d3
Set enterprise relationship permissions from a list
2014-08-25 14:54:52 +10:00
Rohan Mitchell
50c559964c
Display enterprise relationship permissions
2014-08-25 13:28:02 +10:00
Rohan Mitchell
b4e89ad2c0
Convert enterprise relationship permission to string presentation
2014-08-25 13:27:01 +10:00
Rohan Mitchell
70feef1256
Add EnterpriseRelationshipPermission model
2014-08-25 13:26:23 +10:00
Rohan Mitchell
cb615ba994
Render enterprise relationships JSON with AMS instead of rabl
2014-08-25 13:07:31 +10:00
Rohan Mitchell
3524e658f8
Error when creating product and master is invalid, instead of creating a product without a master
2014-08-25 11:52:15 +10:00
Rohan Mitchell
4ceaec0ef5
Do not error when checking out with a pre-loaded shipping/billing address
2014-08-22 17:34:42 +10:00
Maikel Linke
adf4f92ffb
Store links to root_path instead of product_path
2014-08-22 16:10:23 +10:00
Maikel Linke
ca7eb72688
Adding login_nav partial from spree_auth_devise
...
Preparing to change 'Store' link for Bugherd #443 .
2014-08-22 16:04:46 +10:00
Rohan Mitchell
dd42b0c239
Split out opening payments into own context
2014-08-22 14:38:44 +10:00
Rohan Mitchell
e173c69ee3
Fix arrow position
2014-08-19 16:53:23 +10:00
Rohan Mitchell
b35c5e902f
Fix broken JS specs
2014-08-19 16:47:51 +10:00
Rohan Mitchell
e3b4f6efc1
When profile admin only, do not show payment methods, shipping methods or enterprise fees when editing profile
2014-08-19 16:43:18 +10:00
Rohan Mitchell
a533daab96
Split sidebar into parts
2014-08-19 16:41:49 +10:00
Rohan Mitchell
4b42c28bd5
Refactor admin enterpriseCtrl - variable naming, if x then true else false antipattern
2014-08-19 16:34:56 +10:00
Rohan Mitchell
3e97762f7e
Remove unused producer options on hub tab, make logic consistently ordered
2014-08-19 16:23:05 +10:00
Rohan Mitchell
79387d3d82
On admin enterprises listing page, do not show links to pages without perms
2014-08-19 16:15:17 +10:00
Rohan Mitchell
2706c0e47e
Extract enterprise actions to partial
2014-08-19 16:11:20 +10:00
Rohan Mitchell
5dc7d1ee11
For users without product management perms, show a cut-down admin dashboard
2014-08-19 16:02:11 +10:00
Rohan Mitchell
9451f3659c
Use pluralize helper, sentence case
2014-08-19 15:41:01 +10:00
Rohan Mitchell
e1a1b74f03
Extract dashboard enterprises table markup into partials
2014-08-19 14:49:20 +10:00
Rohan Mitchell
50e4c5fac9
Users with only a profile-level enterprise see only menu items for enterprise management
2014-08-19 14:26:45 +10:00
Rohan Mitchell
abe592c9a3
Allow Reports admin tab to be enabled/disabled through cancan :report resource
2014-08-19 14:22:19 +10:00
Rohan Mitchell
0e6cd30e7e
Edit for clarity
2014-08-19 13:27:45 +10:00
Rohan Mitchell
732a61664f
Split abilities into enterprises/products/relationships
2014-08-19 13:21:20 +10:00
Rohan Mitchell
a858c21296
Enterprise has a type (full, single, profile), editable by admin
2014-08-19 11:37:31 +10:00
Rohan Mitchell
2660ffd459
Fix duplicate enterprise role
2014-08-16 16:33:07 +10:00
Rohan Mitchell
a0a752a3b1
Don't re-create FK
2014-08-15 17:34:24 +10:00
Rohan Mitchell
63f9abdf5c
Add CSS3 animations to enterprise roles admin
2014-08-15 16:09:06 +10:00
Rohan Mitchell
9ddfb1584b
Admin can delete enterprise roles
2014-08-15 16:09:06 +10:00
Rohan Mitchell
95a0bf39f7
Enterprise roles must be unique
2014-08-15 16:09:05 +10:00
Rohan Mitchell
6e17f0aaa2
Admin can create enterprise roles
2014-08-15 16:09:05 +10:00
Rohan Mitchell
8bc9def6ae
Switch to AMS for enterprise role serialisation
2014-08-15 16:09:05 +10:00
Rohan Mitchell
1d77812ab8
Admin can list enterprise roles
2014-08-15 16:09:04 +10:00
summerscope
a03c4f7110
Merge branch 'master' into laura_and_will
2014-08-15 12:17:05 +10:00
summerscope
7f6a7b4254
Adding underlines to links on modals for map view etc to try and make these more intuitive and usable
2014-08-15 11:02:21 +10:00
summerscope
8ef91d1b2a
Styling and layout tweaks for checkout page to improve how columns sit on small devices
2014-08-14 12:09:55 +10:00
summerscope
3d2c196237
Tweak layout for checkout accordions to prevent expand and hide from dropping over two lines on small devices
2014-08-14 12:09:23 +10:00
Rohan Mitchell
50b8eaecab
Add fundraising fees
2014-08-13 15:07:32 +10:00
Rohan Mitchell
f30c67da7b
Remove crowdfunding notice from README
2014-08-12 14:07:16 +10:00
Rohan Mitchell
d05e5e430a
Revert "Adding CTA button for crowdfunding site to homepage & countdown timer directive"
...
This reverts commit 75f3358e2a .
2014-08-12 14:06:13 +10:00
Rohan Mitchell
cc011f5136
Switch to forked version of better_spree_paypal_express - passes customer email and phone number to paypal. Waiting on PR #117
2014-08-12 12:34:42 +10:00
Rob H
a7b3bbee74
Overriding payment method load_data to hide Bogus Gateways
2014-08-09 12:52:00 +10:00
Rob H
c20369919c
Can change hub after changing pm type
2014-08-09 11:23:05 +10:00
Rob H
044a4c6816
Finish changing class names for PayPal gateways
2014-08-08 23:19:13 +10:00
Rob H
a8b823668f
Fix checkout specs failing due to payment method not having hub
2014-08-08 22:40:24 +10:00
Rob H
51f912033b
Remove test for PayPalExpress UK which does not exist anymore
2014-08-08 22:39:26 +10:00
Rob H
115d8e0d6e
Smoosh distributions up into cart item subtotal in order confirmation email
2014-08-08 17:50:00 +10:00
Rob H
40d290951c
Fix failing specs related to requiring distributor for payment method
2014-08-08 17:47:51 +10:00
Rob H
6b73eb435c
Add js specs for providers controller
2014-08-08 17:47:51 +10:00
Rob H
9e54162a62
Annoying migration changes
2014-08-08 17:47:51 +10:00
Rob H
d80166e80d
Restrict access to show_provider_preferences action on payment methods controller
2014-08-08 17:47:50 +10:00
Rob H
f19af52556
WIP: angularised provider settings for payment method works on create (for admin only at this stage)
2014-08-08 17:47:50 +10:00
Rob H
f430267304
Specs for show_provider_preferences
2014-08-08 17:47:50 +10:00
Rob H
16215289d0
Spec for payment method clean_name translation
2014-08-08 17:47:50 +10:00
Rob H
f021d260b1
Require payment_methods to be associated with at least one hub
2014-08-08 17:47:50 +10:00
Rob H
d6aae0050f
Angularise payment method provider UI
2014-08-08 17:47:50 +10:00
Rob H
55e29832e1
Make name of payment_methods more human readable
2014-08-08 17:47:50 +10:00
Rob H
1cbdd9a5fa
WIP: rearrange payment methods page
2014-08-08 17:47:49 +10:00
Rob H
25d7adac83
WIP: Replace configuration menu on payment methods edit page
2014-08-08 17:47:49 +10:00
Rob H
5fea15e8a9
Better error reporting for failed save on BPE
2014-08-08 14:05:54 +10:00
Rob H
d8c1823328
Fix broken specs
2014-08-08 14:05:54 +10:00
Rob H
3b9cd3f46a
Make loading on BOM look more like BPE
2014-08-08 14:05:53 +10:00
Rob H
e6f7f26a95
Add loading gif to BPE, fiddle with interface
2014-08-08 14:05:53 +10:00
Rob H
32c8b9cdcd
Switch Taxons input over to category selection on BPE, clean up interface
2014-08-08 14:05:53 +10:00
Rob H
1e68052711
Moving update button to top of BPE
2014-08-08 14:05:53 +10:00
Rob H
d27908fd2f
Add ability to reset filters to BPE
2014-08-08 14:05:53 +10:00
Rob H
37ecadf6fc
Taxons by ID converts id to string
2014-08-08 14:05:53 +10:00
Rob H
5f277dae61
Fixing BPE specs related to filtering
2014-08-08 14:05:52 +10:00
Rob H
e76c2a215a
Fix BPE spec around supplier conversion in filtering
2014-08-08 14:05:52 +10:00
Rob H
59a3fe11ad
Fix taxon service specs
2014-08-08 14:05:52 +10:00
Rob H
d9692312ac
WIP: swapping filters over to drop downs
2014-08-08 14:05:52 +10:00
Rob H
2f5b5e7ee5
Inject taxons into BPE
2014-08-08 14:05:52 +10:00
Rob H
aaddccfae4
Injecting producer information into BPE
2014-08-08 14:05:51 +10:00
Rob H
c139e2fab2
Remove 500 product warning
2014-08-08 14:05:51 +10:00
Rob H
27e992ebcb
Staggered loading of products in BPE
2014-08-08 14:05:51 +10:00
Rob H
b9f49344b4
BPE: Switch column toggle to dropdown, clean up specs
2014-08-08 14:05:51 +10:00
Rob H
9922dc6e79
Replace pagination with infinite scroll on BPE
2014-08-08 14:05:51 +10:00
Rob H
1abbc7fa86
Switch data injection for BPE over to AMS
2014-08-08 14:05:50 +10:00
Rob H
e02a742597
WIP: Removing requirment for refresh of products on BPE
2014-08-08 14:05:50 +10:00
Rob H
a14c2dbb04
Decouple bpe specs from update process
2014-08-08 14:05:50 +10:00
Rohan Mitchell
16847025dd
Fix bug: local storage was not correctly keyed to user id
2014-08-08 11:14:50 +10:00
Rohan Mitchell
f3e43ebd29
Use .location for testability
2014-08-08 11:10:51 +10:00
Rohan Mitchell
c30d7fe72a
Fix broken JS specs
2014-08-08 09:56:55 +10:00
Rohan Mitchell
c79aca3de5
Merge branch 'laura_and_will'
2014-08-08 09:51:50 +10:00
Rohan Mitchell
7476860b47
Comment out intermittently failing spec - we intend to remove product distributions soon anyway
2014-08-07 17:20:38 +10:00
summerscope
116882f0a9
More responsive tweaks
2014-08-07 17:06:16 +10:00
Rohan Mitchell
dc49fbfe62
Merge branch 'laura_and_will'
2014-08-07 16:50:00 +10:00
Rohan Mitchell
4f0d55a859
Link error page images absolutely, fixes image not found on eg. /page/not/found
2014-08-07 16:46:58 +10:00
Rohan Mitchell
e28e86a82c
Remove link from cart to old product page
2014-08-07 16:46:57 +10:00
Rohan Mitchell
f8c71ced45
Fix display of state_name, after attribute was renamed in serializer
2014-08-07 16:46:57 +10:00
summerscope
c2690d0c20
Tweak responsive queries
2014-08-07 16:23:47 +10:00
summerscope
fb7547ae2f
Add a little padding on modals
2014-08-07 16:23:19 +10:00
summerscope
c2540234f1
Add class to force word wrap
2014-08-07 16:18:02 +10:00
summerscope
bda9030ae4
Add a word wrap class to force long strings to wrap
2014-08-07 16:17:15 +10:00
summerscope
be9acf526d
Change modal height to perpercentage of container height
2014-08-07 15:39:39 +10:00
summerscope
28a04c5e84
Fix media query
2014-08-07 15:31:05 +10:00
summerscope
febe66b7b0
Styling for modals - making media queries look at container height rather than width
2014-08-07 15:22:38 +10:00
summerscope
cd774a3a2b
Fix small device width issue on google map embedding
2014-08-07 15:22:38 +10:00
summerscope
c6a350af75
Better column layout for responsive
2014-08-07 15:22:38 +10:00
Rohan Mitchell
769e8410cc
Fix checkout total display
2014-08-07 14:53:30 +10:00
Rohan Mitchell
d1c9980f3f
Checkout include distribution fees in cart total
2014-08-07 14:47:49 +10:00
Rob H
30a14edb06
Adding 'Total Units' field to supplier report
2014-08-07 14:21:01 +10:00
summerscope
591c3959f9
Make shopping cart wider by default
2014-08-07 12:07:36 +10:00
summerscope
68ed327efc
Tweaking popover styles for shop price breakdown popovers
2014-08-07 12:07:36 +10:00
summerscope
7d7bf7b1f2
Tweak layout for cart to make it more robust for content and allow for longer product labels
2014-08-07 12:07:35 +10:00
Rohan Mitchell
c814a0a2bf
Merge branch 'master' into laura_and_will
2014-08-07 11:57:58 +10:00
summerscope
fe4980eadd
Tweaking styling on popovers
2014-08-06 17:07:27 +10:00
summerscope
5f409e4476
Tweak label for shopping cart CTA button again
2014-08-06 16:59:14 +10:00
summerscope
cde1bcb1f5
Styling for popovers on graph - price breakdown
2014-08-06 16:58:49 +10:00
summerscope
b06d08015d
Tweak summary label
2014-08-06 16:36:25 +10:00
summerscope
280f6f856b
update go to shopping cart button label try again
2014-08-06 16:36:08 +10:00
summerscope
65b7cadf09
Change label for next button to Go to my cart
2014-08-06 16:28:22 +10:00
summerscope
3de0f7893d
Change the language and layout of order cycle popover
2014-08-06 16:26:32 +10:00
summerscope
3c40ce1097
Add a unit to border-radius
2014-08-06 16:26:07 +10:00
summerscope
1fa30dbfaa
Order cycle popover make strong red and left aligned so it works when used for multiple order cycle use-cases
2014-08-06 16:25:38 +10:00
summerscope
581cf442a2
Add ToS as a PDF attachment rather than an external site
2014-08-06 16:24:47 +10:00
summerscope
de725a4cd6
Add unti to border radius
2014-08-06 14:34:46 +10:00
summerscope
099e2257ca
Adding width and height into SVGs to fix the firefox bug
2014-08-06 14:34:45 +10:00
Rob H
5a34fa41b3
Fixing cart total in checkout
2014-08-06 13:59:47 +10:00
summerscope
5d2dda2ee4
Tweak checkout header
2014-08-06 13:34:35 +10:00
summerscope
6515f0f096
Tweak labels to make page heading more consistent, give useful names to SHopping cart and Checkout pages
2014-08-06 13:34:06 +10:00
summerscope
d48b317d3b
Checkout page header update
2014-08-06 13:25:06 +10:00
summerscope
1ca9c60c84
Tweak label to make a distinction between go straight to checkout and just go to shopping cart review
2014-08-06 13:18:58 +10:00
summerscope
66f1a672a3
Change Cost label to Item Cost for price breakdowns
2014-08-06 13:02:37 +10:00
summerscope
aaae8dce2d
Move button out of UL in nesting
2014-08-06 12:57:44 +10:00
summerscope
3475506ad0
Remove the logic around fees breakdown as not showing on this view now
2014-08-06 12:57:16 +10:00
summerscope
2fca9ed3e9
Tweak blues for success button style
2014-08-06 12:49:49 +10:00
summerscope
e91e638d35
Tweaking cart summary view markup
2014-08-06 12:21:08 +10:00
summerscope
2c95f00485
Adding T&Cs into footer link
2014-08-06 12:02:10 +10:00
summerscope
c3452b178b
Styling popovers so the price breakdown is different to the shopping cart popover
2014-08-06 12:00:04 +10:00
summerscope
9ba8eb8bae
Add animation easing and remove glow from product level highlight
2014-08-06 11:49:29 +10:00
summerscope
d254a8f3d9
Tweak styling to bring back hover states against product row for shopfront view
2014-08-06 11:35:29 +10:00
Will Marshall
bb09236468
Merge branch 'laura_and_will'
2014-07-31 16:06:39 +10:00
Will Marshall
6b00b1c14c
MOAR COMMENTS
2014-07-31 15:58:03 +10:00
summerscope
5cff2f0f40
Tweak colors for popovers
2014-07-31 15:47:54 +10:00
Will Marshall
7ca618fb29
Moving to state_name
2014-07-31 15:38:26 +10:00
summerscope
b0f15aef10
Popovers finish styling for various use cases
2014-07-31 15:38:25 +10:00
Rohan Mitchell
494b572c69
Do not show zero fees
2014-07-31 15:36:26 +10:00
Maikel Linke
bd3a4acc15
Giving an example name for an enterprise fee.
...
The example is displayed as input placeholder. See bugherd #439 .
2014-07-31 15:21:13 +10:00
Maikel Linke
722ccfc83b
ng_text_field handling options parameter
2014-07-31 15:20:22 +10:00
Will Marshall
647495465a
Comments and minor refactoring
2014-07-31 15:14:11 +10:00
Will Marshall
042db2d150
Some comments and refactoring
2014-07-31 15:14:11 +10:00
summerscope
7ad10ee076
Style popovers and price breakdowns
2014-07-31 15:08:16 +10:00
summerscope
f868fe1091
Change markup for the graph button to make it align where we want
2014-07-31 15:07:52 +10:00
summerscope
44d7ae8b61
Tweak the markup for brice breakdown and percentage for styling
2014-07-31 15:07:22 +10:00
summerscope
c4984144d3
Turn off blue highlight in Chrome for all buttons across the system
2014-07-31 15:06:17 +10:00
Rohan Mitchell
a26450d173
Remove unused spree searcher class - causing intermittent test failures
2014-07-31 14:58:18 +10:00
Will Marshall
d9f3dfb571
Removing a pointless error message
2014-07-31 12:23:22 +10:00
Will Marshall
0f76892a5b
Handling max quantity magically
2014-07-31 12:23:10 +10:00
Will Marshall
d70ed02977
Restoring caching on addresses
2014-07-31 12:04:23 +10:00
Will Marshall
dc1963497a
SORTING BY PRIMARY TAXON NAME
2014-07-31 12:04:22 +10:00
summerscope
ee067d4804
Style the map input
2014-07-31 12:00:46 +10:00
summerscope
33a177ed47
Make map input placeholder message useful
2014-07-31 12:00:46 +10:00
Rohan Mitchell
5417242b85
Remove image decorator - image sizes are already configurable from spree config
2014-07-31 12:00:43 +10:00
Will Marshall
86c1d010e7
Default quantity to null rather than zero
2014-07-31 11:49:34 +10:00
Will Marshall
cf3fc7edbf
Merge branch 'master' into laura_and_will
...
Conflicts:
app/serializers/api/address_serializer.rb
2014-07-31 11:47:54 +10:00
Rohan Mitchell
29b3a080ac
Only show fees if present
2014-07-31 11:43:02 +10:00
Rohan Mitchell
a1dd5dabac
Replace sleep with wait, add cart_dirty spec helper
2014-07-31 11:36:53 +10:00
Rohan Mitchell
126e0a1f6d
Link variants -> products, fixes group buy
2014-07-31 11:36:53 +10:00
Rohan Mitchell
8c41a6c909
Calculate fee breakdown
2014-07-31 11:36:53 +10:00
Rohan Mitchell
45fd479ade
WIP: Call create_order_adjustments_for on EnterpriseFeeCalculator
2014-07-31 11:36:53 +10:00
Rohan Mitchell
8fe355b6da
WIP: Call create_line_item_adjustments_for on EnterpriseFeeCalculator
2014-07-31 11:36:53 +10:00
Rohan Mitchell
b40b6f9faf
WIP: Call fees_for on EnterpriseFeeCalculator
2014-07-31 11:36:53 +10:00
Rohan Mitchell
66cece5903
WIP: Extract order cycle fee calculations to EnterpriseFeeCalculator
2014-07-31 11:36:53 +10:00
Will Marshall
e8045cac42
Renaming to state_name
2014-07-31 11:36:53 +10:00
summerscope
659462327c
Commenting out taxon icon for now
2014-07-31 11:29:14 +10:00
summerscope
46146c83a8
Make the link for product modal just go around the text and not full block
2014-07-31 11:29:02 +10:00
Will Marshall
44bb53b137
Moving to state_name
2014-07-31 11:11:34 +10:00
Will Marshall
001db8d07e
Renaming to state_name
2014-07-30 17:09:31 +10:00
Rohan Mitchell
753ea16093
Merge branch 'breakdowns' into laura_and_will
2014-07-30 15:12:25 +10:00
Rohan Mitchell
9fa0413e8e
Add full price breakdown
2014-07-30 15:11:59 +10:00
Rohan Mitchell
fc95e088df
Show collapsed price breakdown
2014-07-30 14:59:16 +10:00
Rohan Mitchell
77b279ca97
Stub base_price and fees on variant serializer. Calculate basePricePercentage on variant.
2014-07-30 14:34:05 +10:00
Rohan Mitchell
1ac5b79aeb
Fix failing JS specs
2014-07-30 14:33:36 +10:00
Will Marshall
339e5975fa
Merge branch 'master' into breakdowns
2014-07-30 13:45:46 +10:00
Will Marshall
88c3f7f9b3
Removing a couple of pointless files
2014-07-30 13:45:37 +10:00
summerscope
cf1cf085d9
Popover for shopping cart styling required for medium and small views
2014-07-29 17:08:31 +10:00
summerscope
47a38d1815
Tweak the styling on producer modals so no grey background
2014-07-29 16:50:48 +10:00
summerscope
8ed79c6e55
Make scrolling on outer container only
2014-07-29 16:50:26 +10:00
summerscope
62d5149e7a
Add back styling which sort of works for modals until i can pair with will to fix it
2014-07-29 16:15:35 +10:00
summerscope
682b04287e
Make product thumbnail background white by default
2014-07-29 16:03:13 +10:00
Will Marshall
10fcf80be1
Switching back to proper bounds fitting
2014-07-29 15:34:14 +10:00
Will Marshall
606981dee9
Merge branch 'maps'
2014-07-29 15:32:23 +10:00
Will Marshall
6873b33e1f
Directive restored
2014-07-29 15:32:19 +10:00
Will Marshall
90eea5cb16
Switching to a single directive to render variants on /shop
2014-07-29 15:23:10 +10:00
Will Marshall
4264e3b7b7
Fixing a time issue
2014-07-29 14:11:51 +10:00
Will Marshall
2ef0545561
Merge branch 'laura_and_will'
2014-07-29 14:09:29 +10:00
Will Marshall
71b898cdec
Tweaking product image logic
2014-07-29 14:09:28 +10:00
Will Marshall
1e207fefd1
Fixing the product modal so it renders either an actual image or nothing
2014-07-29 14:09:28 +10:00
Will Marshall
8496609cc2
Fixing up a couple of regressions
2014-07-29 13:46:38 +10:00
summerscope
e5b675dcaf
Change thumbnail outline color
2014-07-29 13:35:59 +10:00
summerscope
d8fa5a1af9
Make product thumb resized and recoloured
2014-07-29 13:34:19 +10:00
Will Marshall
21cc5bc05a
Tweaking product image logic
2014-07-29 13:05:45 +10:00
Will Marshall
8e5951f80c
Fixing the product modal so it renders either an actual image or nothing
2014-07-29 13:05:44 +10:00
summerscope
b60c9daf21
Modal tweaks to make interior container scroll when too high
2014-07-29 12:57:22 +10:00
Will Marshall
f1c4ca98a1
Defaulting to OFN logo
2014-07-29 12:55:58 +10:00
Will Marshall
118e0f9fd8
Rescoping a couple of partials
2014-07-29 12:51:51 +10:00
Will Marshall
48b8c7e6c1
reverting our change back to position fixed
2014-07-29 12:51:51 +10:00
summerscope
e308b7a3a8
Comment out Price breakdown graph and popover until we can make this work
2014-07-29 12:26:36 +10:00
Will Marshall
2d40a8f023
Fixing links on modals
2014-07-29 12:20:06 +10:00
Will Marshall
c4f7c1af60
Lots of small bug fixes, changing image sizes
2014-07-29 11:33:25 +10:00
Will Marshall
39a79869c0
Disabling buttons and some work on the price breakdowns, including commenting them out for now
2014-07-29 11:33:25 +10:00
summerscope
4ab781d74a
Update and tweak producers page background image
2014-07-29 10:53:34 +10:00
summerscope
004de7919a
Add sexy search into groups page
2014-07-29 10:42:30 +10:00
summerscope
3ebc2ba145
Fix checkout button layout in menu for firefox etc
2014-07-28 16:41:26 +10:00
summerscope
d6c9f41a00
Making the styling for headings on modals better
2014-07-28 16:14:44 +10:00
summerscope
6dc15ff075
Make the modal headers consistent
2014-07-28 16:14:20 +10:00
summerscope
3d472bc57e
Make the header styles consistent for the modals
2014-07-28 16:14:01 +10:00
summerscope
cd27a2f3cb
Update map icons to make them match new colors
2014-07-28 16:10:17 +10:00
summerscope
8f83853a5c
Hub remove unnecessary style
2014-07-28 15:23:55 +10:00
summerscope
06cf8c1f0f
A little bit more refactoring to make things scalable and cleaner
2014-07-28 15:04:07 +10:00
summerscope
33b7df596b
Use a consistent naming convention for hubs and producers on css class skinny-head
2014-07-28 15:03:49 +10:00
summerscope
9e4615f141
Refactoring css for active_table and hub producer children. Tighten and tidy css, make consistent for hubs and producers nodes across all responsive sizes.
2014-07-28 13:51:44 +10:00
summerscope
68aaf24f5c
Remove active_table specific styles from this stuff
2014-07-28 13:51:44 +10:00
summerscope
7a62ae6637
Add style for turquoise text
2014-07-28 13:51:44 +10:00
summerscope
f53902da0f
Tweak hubs for responsive views
2014-07-28 13:51:44 +10:00
summerscope
78ac55418c
Tweak producers for responsive views,
2014-07-28 13:51:43 +10:00
Will Marshall
20d7484134
Merge branch 'master' into laura_and_will
...
Conflicts:
app/assets/javascripts/darkswarm/services/order.js.coffee
2014-07-28 13:43:31 +10:00
Will Marshall
9d0919d201
Further minor regressions
2014-07-28 13:41:38 +10:00
Will Marshall
a5f478bde7
Ajax submission of max quantity
2014-07-28 13:33:13 +10:00
Will Marshall
39f9e991ad
Minor regressions and bug fixes
2014-07-28 11:30:35 +10:00
summerscope
d3cfceaf94
Producer tab on shopfront tweaks - add producer icon and better classes for responsive
2014-07-25 17:29:15 +10:00
summerscope
237d5a990e
Remove double-up on URL string for social icons
2014-07-25 17:28:23 +10:00
summerscope
769a7d3b90
Add a center aligned class
2014-07-25 17:28:06 +10:00
summerscope
5a8fb4670f
Cart styling updates
2014-07-25 16:41:50 +10:00
summerscope
31b227892a
Style updates for shopping cart rich pop-over
2014-07-25 16:41:32 +10:00
summerscope
dd984ac198
Hub node more responsive tweaks
2014-07-25 14:39:14 +10:00
summerscope
4ee5647dcc
Design tweaks to homepage view
2014-07-25 14:38:56 +10:00
summerscope
e5a9a00378
Adding pretty macbook image behind Scuse us pane
2014-07-25 14:36:08 +10:00
Rohan Mitchell
f73a63e944
Switch spec to better spree paypal express payment method
2014-07-25 13:47:31 +10:00
summerscope
d2850ae794
Tweak the layout of hubs for responsive
2014-07-25 13:16:21 +10:00
summerscope
07432cebc3
Styling tweaks to hub nodes on homepage search for responsiveness. Makes the Hub name not flow over two lines ever. Cus no.
2014-07-25 13:16:01 +10:00
Rohan Mitchell
fd3040d394
Call reset order callback when order completed via paypal
2014-07-25 12:44:14 +10:00
Rohan Mitchell
50f74038b2
Fix redirect to paypal for better spree paypal express
2014-07-25 12:44:14 +10:00
Rohan Mitchell
3b28981400
Adapt cancel redirect for better spree paypal express
2014-07-25 12:44:14 +10:00
Rohan Mitchell
5c5e7e8ed3
Hide checkout paypal button, remove unneeded frontend JS
2014-07-25 12:44:14 +10:00
Rohan Mitchell
5980234be0
Install better_spree_paypal_express
2014-07-25 12:44:14 +10:00
Rohan Mitchell
e8b409c1f4
Switch from spree_paypal_express to better_spree_paypal_express
2014-07-25 12:44:14 +10:00
summerscope
fb4a36c0ff
Add new button style for use - turquoise for secondary CTA buttons
2014-07-24 17:45:04 +10:00
summerscope
561cd31864
Tweak color to reflect branding colors
2014-07-24 17:44:45 +10:00
summerscope
b57aaa8ec8
More styling tweaks and adjustments for responsive
2014-07-24 17:44:21 +10:00
summerscope
f71dee6b01
Remove border on filters to reflect change of button color
2014-07-24 17:43:57 +10:00
summerscope
76ed0cc976
Add some spacing on Checkout now button for small screens so the buttons dont fight
2014-07-24 17:43:34 +10:00
summerscope
995451351a
Tweak layout of columns for Hubs listing on medium and small views
2014-07-24 17:43:07 +10:00
summerscope
79b9db5d52
Producer styles tweak with changes to active table
2014-07-24 17:42:23 +10:00
summerscope
9babd04472
Tweak turquoise secondary colors
2014-07-24 17:42:04 +10:00
summerscope
c799d8b387
Make filter button turquoise
2014-07-24 17:41:48 +10:00
summerscope
01395f4eca
Adjust active table styles to be a bit more generic
2014-07-24 16:33:05 +10:00
summerscope
94151a9152
Remove duplicated comments
2014-07-24 16:33:04 +10:00
summerscope
8bf3ad0bae
Styling for new hub view on homepage in active_table
2014-07-24 16:33:03 +10:00
summerscope
b4db155612
Add taxon style for inactive row on active_table
2014-07-24 16:33:03 +10:00
summerscope
a3278209ac
Tweak markup for active table Hubs
2014-07-24 16:33:03 +10:00
Will Marshall
bd662d4ec8
Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will
...
Conflicts:
app/views/shop/products/_master.html.haml
2014-07-24 16:07:56 +10:00
Will Marshall
2120ab96ca
Fixing bugs and spec regressions
2014-07-24 16:02:10 +10:00
Rohan Mitchell
3dd7b296be
Show order notes (special instructions) on report and confirmation email
2014-07-24 15:13:23 +10:00
Rohan Mitchell
d1b2f01578
Add special instructions to checkout
2014-07-24 15:13:23 +10:00
Rohan Mitchell
cecc0134f4
When mirroring a database, bring all payment methods into dev env
2014-07-24 15:13:22 +10:00
Will Marshall
f45dd24803
Patched up popovers for our nefarious purposes + cart pretties
2014-07-24 14:56:13 +10:00
Rob H
3d57e0a7a7
Add 'new' buttons to shipping and payment method edit pages
2014-07-24 13:46:35 +10:00
Rob H
177472dad9
Add asterix to product category on new product form
2014-07-24 12:58:42 +10:00
Rob H
fa48fa24b5
Restricting links in hubs sidebar to left hand side of row
2014-07-24 11:41:47 +10:00
Rob H
85cce0783e
Fix styling for enteprise fees list
2014-07-24 11:34:38 +10:00
Rob H
2e5652472c
Restricting links in enterprise page sidebars to left hand side of row
2014-07-24 11:29:55 +10:00
Will Marshall
63807fd2cd
Fixing case when order doesn't axshully exist
2014-07-24 11:24:09 +10:00
Will Marshall
8ac0ee8f0e
Fixing a missing scope on product.variants
2014-07-24 11:23:56 +10:00
Rob H
7fc80a0975
Fix failing enterprise spec
2014-07-24 11:05:14 +10:00
summerscope
6961a2ad00
Take the pop overs out of the tabindex
2014-07-24 10:58:08 +10:00
summerscope
2d25bd8a45
Adding checkout button back to the top as a stop gap measure
2014-07-24 10:57:37 +10:00
Will Marshall
d7ff1cd4af
Merge branch 'laura_and_will' into new_cart
...
Conflicts:
app/views/checkout/_payment.html.haml
app/views/checkout/_shipping.html.haml
app/views/shop/products/_master.html.haml
app/views/shop/products/_variants.html.haml
2014-07-24 10:39:36 +10:00
Rob H
9055a441fd
Removing trailing whitespace
2014-07-24 10:28:28 +10:00
Rob H
508149fbca
Adding shipping methods angularisation to enterprise edit view
2014-07-24 10:16:55 +10:00
Rob H
9889b09c65
Add shipping method injection helper using id name serializer
2014-07-24 10:16:55 +10:00
Rob H
e8c7fe9db1
Rename payment method serializer as id name serializer
2014-07-24 10:16:55 +10:00
Rob H
37c16fb20c
Add shipping method js infrastructure for angularising admin enterprises page
2014-07-24 10:16:54 +10:00
Rob H
6dbe2a3098
WIP: Angularise payment methods on enterprise edit page
2014-07-24 10:16:54 +10:00
Rob H
2200392031
Angularising Admin enterprises form
2014-07-24 10:16:54 +10:00
summerscope
a40b5689a9
Checkout page design tweaks and improvements to make accordion more usable
2014-07-23 16:57:38 +10:00
summerscope
fac7f9f818
Shopfront more styling and improvements for responsive.
2014-07-23 16:36:52 +10:00
summerscope
d6a4ae3cbf
Will Marshall will you please read the comment here and help me with all the logix
2014-07-23 16:36:34 +10:00
Rob H
c4e50dbb13
Change error message for blank Product Category
2014-07-23 15:46:17 +10:00
summerscope
609326793a
Styling for mobile menu line items
2014-07-23 15:36:15 +10:00
summerscope
7718cf0c48
Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things
2014-07-23 15:35:44 +10:00
summerscope
875f0f6780
Apply border radius against alllll the buttons
2014-07-23 15:15:48 +10:00
summerscope
47d84c25f6
Shopfront styling
2014-07-23 15:15:16 +10:00
summerscope
98e6c5e412
Markup tweaks to tweak inclusion of graph popover button
2014-07-23 15:15:03 +10:00
summerscope
f6c1ddc08a
No change
2014-07-23 15:14:33 +10:00
summerscope
5b87a81460
Tweak bullet point list style content: to include right icon
2014-07-23 15:14:14 +10:00
summerscope
9f0457f355
Tweaking reds to make them a touch less berry
2014-07-23 15:13:47 +10:00
summerscope
9782d76f61
Tweak avenir in big input to avoid padding conflict
2014-07-23 15:13:29 +10:00
summerscope
7d5e7a9123
New popovers sass partial
2014-07-23 15:13:12 +10:00
summerscope
6dd5588ed5
Updating icon font to included some new required icons
2014-07-23 15:12:55 +10:00
Rob H
c8ddf86a9f
Add failure block to create respond_override for creating products
2014-07-23 14:56:12 +10:00
summerscope
93f576e616
Turning of Maps, Groups, and Producers panes
2014-07-18 17:17:42 +10:00
summerscope
d86172d504
Adding rounded corners to alllllll the buttons
2014-07-18 17:17:18 +10:00
summerscope
56850d6d7d
Design tweaks
2014-07-18 17:16:49 +10:00
summerscope
60a860b2ae
New background image for entry point
2014-07-18 17:16:24 +10:00
summerscope
3cb3dcccd9
Tweak background style for entry point to site
2014-07-18 17:16:14 +10:00
summerscope
8653d356ff
Tweaking primary red - more berry, less brick
2014-07-18 17:15:51 +10:00
summerscope
a711387794
Changing colors on SVGs to tweak for new primary red color
2014-07-18 17:15:35 +10:00
Will Marshall
92b7966941
Triggering dialog if page unsaved
2014-07-18 17:07:40 +10:00
Will Marshall
edaba844d9
Merge branch 'laura_and_will' into new_cart
...
Conflicts:
app/views/shop/products/_form.html.haml
app/views/shop/products/_master.html.haml
app/views/shop/products/_variants.html.haml
2014-07-18 17:02:19 +10:00
summerscope
fe0956d3bb
Update markup to make total price its own row on small devices
2014-07-18 16:36:14 +10:00
summerscope
63b0bb8122
Updating styling for product rows for small devices - total price gets its own row
2014-07-18 16:34:48 +10:00
summerscope
8d1175c495
Tweaks to input layout for responsive
2014-07-18 16:34:25 +10:00
Will Marshall
a480353158
Working bindings
2014-07-18 16:05:58 +10:00
summerscope
751865a540
More markup tweaks for responsive
2014-07-18 16:05:30 +10:00
summerscope
9e74bb8bf0
Pulling out css for refactoring, partials and further tweaks for responsive
2014-07-18 16:05:19 +10:00
summerscope
978b64547e
Refactoring SASS for shopfront to add partials, break it out into logical clusters
2014-07-18 16:04:53 +10:00
Will Marshall
b25def810c
Working version of the cart integration
2014-07-18 14:56:15 +10:00
Rohan Mitchell
03273a76ad
Merge branch 'fix_units'
2014-07-18 14:11:41 +10:00
Rohan Mitchell
7db2aff398
Generate variantUnitOptions - DRY
2014-07-18 14:10:42 +10:00
Will Marshall
a3d402ad53
Moving variants to a service, backreferencing and linking
2014-07-18 13:59:34 +10:00
summerscope
93aa3b5364
Tweak responsive on taxon icons
2014-07-18 12:54:28 +10:00
summerscope
fca552b254
Adjusting markup and adding classes to target elements as needed for responsive styling
2014-07-18 12:52:59 +10:00
summerscope
29058fa7cc
Responsive styling and adjustments to cope with layout changes across devices
2014-07-18 12:50:22 +10:00
Rohan Mitchell
8484d19144
Convert variant_unit_options to a method, camelcase
2014-07-18 12:44:58 +10:00
Rohan Mitchell
04eca9591b
Derive unitScales from unitNames
2014-07-18 12:39:16 +10:00
Rohan Mitchell
52b74bde91
Extract unit names from OptionValueNamer into VariantUnitManager
2014-07-18 12:39:16 +10:00
Rohan Mitchell
ed66633a93
Add comment
2014-07-18 12:39:16 +10:00
Rohan Mitchell
ab1628681e
Call VariantUnitManager directly
2014-07-18 12:39:16 +10:00
Rohan Mitchell
8d5f953f78
Extract getScale from BOM controller to VariantUnitManager, extract specs as well
2014-07-18 12:39:16 +10:00
Rohan Mitchell
eafdf85c28
Extract class methods to new class VariantUnitManager
2014-07-18 12:39:11 +10:00
Will Marshall
a2da7f7ede
Merge branch 'caching' into new_cart
...
Conflicts:
app/serializers/api/variant_serializer.rb
2014-07-18 11:23:25 +10:00
Will Marshall
562f8dbd4e
Starting to restructure data injection
2014-07-18 11:21:51 +10:00
Rohan Mitchell
6c59ffc16f
Switch to class case for OptionValueNamer
2014-07-18 10:06:13 +10:00
summerscope
957c8cf89b
Markup changes to all the partials for new shopfront page design
2014-07-17 17:24:54 +10:00
summerscope
7cb0e079ab
Lots of changes for new shopfront design
2014-07-17 17:24:31 +10:00
summerscope
730373d677
Making all the images optimised - as wee as can be!
2014-07-17 17:24:14 +10:00
summerscope
1c3da6c003
Adding pretty design assets for new shopfront page
2014-07-17 17:23:45 +10:00
Rohan Mitchell
91e4f24fde
Extract JS unit options into option value namer
2014-07-17 16:57:23 +10:00
Rohan Mitchell
989a14fa37
Change KL to kL, update specs for ML to kL change
2014-07-17 16:16:08 +10:00
Will Marshall
33611ddb20
Renaming Product to Products and starting to figure out cart
2014-07-17 15:04:39 +10:00
Will Marshall
67922f38df
Fixing some regressions to data submission
2014-07-17 14:46:46 +10:00
Rohan Mitchell
08409dad0a
Fix down migration - need explicit cast for string -> integer
2014-07-17 14:43:34 +10:00
Rafael Schouten
98d824f09b
use string for postcode
2014-07-17 14:31:51 +10:00
Will Marshall
541fe9ec37
Switching Checkout service to use CurrentOrder
2014-07-17 14:26:54 +10:00
Rohan Mitchell
b326ec8a3c
Remove landing page images
2014-07-17 14:26:46 +10:00
Rohan Mitchell
19118da82e
Remove old landing page cruft
2014-07-17 14:26:07 +10:00
Rohan Mitchell
159d0a9dbe
Remove most references to suburbs - previously used by new_landing_page, no longer used.
2014-07-17 14:26:04 +10:00
Will Marshall
158bdd145f
All the new serializers and some specs
2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c
Moving payment methods and shipping methods into their own services
2014-07-17 14:19:39 +10:00
Rohan Mitchell
736ae3c1e3
mirror_db script also disables S3 in development and pulls down images
2014-07-17 12:56:27 +10:00
Rohan Mitchell
d7a5eb47f3
Store all images in a consistent path, compatible with development, and support S3 all round
2014-07-17 11:07:34 +10:00
Rohan Mitchell
c40c586b6f
Store taxon icons in a path consistent with products
2014-07-17 10:23:07 +10:00
Will Marshall
2b1ab53d8e
Fixing regressions and refactoring our tests
2014-07-16 16:00:44 +10:00
Will Marshall
cd033c300e
Reworking order populator and controller to handle replacement of line items rather than addition
2014-07-16 16:00:28 +10:00
Will Marshall
f4c1cd5253
Merge branch 'master' into caching
2014-07-16 11:47:07 +10:00
Rohan Mitchell
b33a077fd0
Remove bugsnag config - this is added in deployment on a server-by-server basis
2014-07-16 11:45:44 +10:00
Rohan Mitchell
9542b7224c
Ignore rake generated CSV files
2014-07-16 11:26:37 +10:00
Rohan Mitchell
75a59eb5cc
Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order.
2014-07-16 11:26:22 +10:00
Will Marshall
ea357b54ab
Adding some map searching capabilities
2014-07-16 11:19:16 +10:00
Rohan Mitchell
6dfd26ac69
order_with_totals_and_distribut{or,ion}
2014-07-16 10:33:23 +10:00
Rohan Mitchell
42b951c972
Variants controller #search filters by distribution
2014-07-16 10:31:12 +10:00
Rohan Mitchell
f18141c9bb
Use controller login helpers
2014-07-16 10:29:58 +10:00
Rohan Mitchell
d81a78b907
Add spec helper method for logging in as admin in controller specs
2014-07-16 10:15:27 +10:00
Rohan Mitchell
b7a08bcb9b
Add Spree::Variant.in_order_cycle
2014-07-16 09:33:59 +10:00
Rohan Mitchell
0ecfee79d4
Add Spree::Variant.in_distributor
2014-07-16 09:33:59 +10:00
Rohan Mitchell
edeb820c64
Send distributor and order cycle id to order add variant autocomplete search
2014-07-16 09:33:59 +10:00
Rohan Mitchell
ff507b4b25
Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb
2014-07-16 09:33:59 +10:00
Rohan Mitchell
3758a8ae2b
Add rake task to export enterprises to CSV
2014-07-16 09:33:59 +10:00
Rohan Mitchell
7a3f68ea38
Update Rails to 3.2.19
2014-07-16 09:33:59 +10:00
Rafael Schouten
58e6379e43
Merge branch 'master' into fix_units
...
Conflicts:
app/assets/javascripts/admin/products/units_controller.js.coffee
2014-07-14 15:10:26 +01:00
Will Marshall
9f5f319edb
Further patching regression
2014-07-11 17:55:06 +10:00
Will Marshall
a73bc2405d
Fixing one regression
2014-07-11 17:08:39 +10:00
Will Marshall
353ee20feb
Animations fix
2014-07-11 17:07:54 +10:00
Will Marshall
744f254353
Patching a minor bug
2014-07-11 17:02:43 +10:00
Will Marshall
a31f17cdbd
Merge branch 'laura_and_will'
2014-07-11 16:51:50 +10:00
Will Marshall
5e68d0bab7
Basic final version
2014-07-11 16:51:46 +10:00
Will Marshall
679547058e
Merge branch 'laura_and_will'
2014-07-11 16:40:47 +10:00
Will Marshall
06047a380e
Provisional animations
2014-07-11 16:40:44 +10:00
Will Marshall
e940777ede
Few more animation fixes
2014-07-11 16:33:23 +10:00
summerscope
d43fa7eed5
Fixing animations for shopfront
2014-07-11 16:16:56 +10:00
Will Marshall
500e067cfb
Performance enhancements
2014-07-11 16:14:44 +10:00
Will Marshall
7bd65d7854
Performance improvements
2014-07-11 15:09:44 +10:00
Will Marshall
c852eefdbc
Re-enabling infinite scroll
2014-07-11 15:09:44 +10:00
summerscope
d67992eb7b
Tweak animation stylings
2014-07-11 15:07:29 +10:00
summerscope
26d6ac5a8d
Styling no results message for shopfront
2014-07-11 14:50:40 +10:00
summerscope
1eb18e8478
Add some padding to first child in active table - should not be styled from animation classes
2014-07-11 14:42:44 +10:00
summerscope
16d39aeacc
Tweak line-height on product row in shopfront
2014-07-11 14:41:46 +10:00
summerscope
13cc9ba44d
Remove line-height stuff which was making the animation in juddery
2014-07-11 14:41:18 +10:00
summerscope
23182a9026
Grid system layout for filter buttons for all sizes and breakpoints
2014-07-11 13:10:22 +10:00
summerscope
068e3cce1c
More tweaks to filters styling
2014-07-11 13:09:42 +10:00
summerscope
c907e35834
More styling on search and filters
2014-07-11 12:56:14 +10:00
Will Marshall
61dbc2cd63
Replace for shipping selector
2014-07-11 12:54:40 +10:00
Will Marshall
21d1d2d1c1
Replacing taxon directive
2014-07-11 12:53:32 +10:00
Will Marshall
190e320bad
Pulling some structure out of directives
2014-07-11 12:45:08 +10:00
Will Marshall
fecc68cff8
Dereferencing product Taxons
2014-07-11 12:40:49 +10:00
Will Marshall
ef55bf97c6
Bunch of small fixes for Laura
2014-07-11 12:37:38 +10:00
Rob H
d4a6624c28
Prevent display_as and display_name from being used when blank
2014-07-11 12:37:19 +10:00
summerscope
40b858306b
Make all taxons sentence case. ALl of them! for reals yo.
2014-07-11 12:36:27 +10:00
summerscope
88b1b8b104
Styling search for shopfront page
2014-07-11 12:27:51 +10:00
summerscope
6adc056ce0
Styling filters and search on shopfront
2014-07-11 12:27:35 +10:00
summerscope
46017be45c
Make big input fill out all width available
2014-07-11 12:27:17 +10:00
Rob H
fa337fcd6e
Prevent display_as and display_name from being used when blank
2014-07-10 17:04:35 +10:00
Will Marshall
7dde721486
Adding taxon filtering
2014-07-10 15:26:35 +10:00
Will Marshall
26e8a1fd91
Uncaching some parts and adding specs
2014-07-10 14:49:21 +10:00
Will Marshall
55bd23f02b
Merge branch 'laura_and_will'
2014-07-10 14:18:32 +10:00
Will Marshall
932ca95ec5
Sorting hubs by active
2014-07-10 13:04:45 +10:00
summerscope
6681beae4d
Fix spacing for shopfront page search box
2014-07-10 13:04:20 +10:00
Will Marshall
31cf01ba1b
Sorting hubs by active
2014-07-10 12:59:59 +10:00
summerscope
0e0cf5576d
Restyle big search to make it MORE OBVIOUS.
2014-07-10 12:58:38 +10:00
Will Marshall
f57e8513d5
Spiking out products serializers and caching
2014-07-10 12:46:25 +10:00
summerscope
9fa62b39af
More styling for filters and search
2014-07-10 12:22:08 +10:00
summerscope
34cb672a8d
Adjust column layouts / responsive breakpoints for filter systems
2014-07-10 12:21:54 +10:00
summerscope
c8f51ec917
Adjust layout for small views
2014-07-10 12:21:32 +10:00
summerscope
76b25945e9
Adjust layout for small views
2014-07-10 12:21:18 +10:00
Will Marshall
8296a4131e
Partializing filter controls
2014-07-10 12:07:21 +10:00
summerscope
cf4c51e0d9
STyling taxon filters
2014-07-10 12:05:50 +10:00
summerscope
3e24e43100
Tweak icons for up / down
2014-07-10 12:05:49 +10:00
Will Marshall
da02f9c0b0
Adding icons to shipping selectors
2014-07-10 12:02:34 +10:00
Will Marshall
9d519f5f4b
Fixing a minor test regression
2014-07-10 11:52:32 +10:00
Will Marshall
409d647f62
Fixing up hubs page
2014-07-10 11:38:17 +10:00
Will Marshall
0b3b8883cd
Disabling infinite scrolling due to bugs on iPad
2014-07-10 11:38:16 +10:00
summerscope
7c1dfa7b23
Add min width to filter button
2014-07-10 10:36:56 +10:00
summerscope
c744c61f25
Styling for shopfront page with search input
2014-07-09 17:35:21 +10:00
summerscope
ac8d3f8c96
Make a static (non animated) version of big input
2014-07-09 17:35:04 +10:00
summerscope
2c157a939d
Tweak markup / filters available for Producers page
2014-07-09 17:24:24 +10:00
summerscope
864df41052
Add filters partial
2014-07-09 17:24:10 +10:00
summerscope
11ec596133
Layout adjust for taxon filters
2014-07-09 17:23:58 +10:00
summerscope
37924c652a
Add filters partial for Hubs search
2014-07-09 17:23:30 +10:00
summerscope
eda5119bfc
Remove unused styling and unneeded comments
2014-07-09 16:57:33 +10:00
summerscope
0451dbe6b0
More styling to filters and search
2014-07-09 16:55:05 +10:00
summerscope
b43f687cf4
Tweak to producers - turn filters off by default
2014-07-09 16:54:35 +10:00
summerscope
d9a3d22330
Tweak labels for filter button
2014-07-09 16:53:26 +10:00
summerscope
9474ec49c6
Fix unbalanced brackets issue
2014-07-09 16:21:36 +10:00
summerscope
9587b2a2ed
Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will
...
Conflicts:
app/views/producers/_filters.html.haml
2014-07-09 16:18:41 +10:00
summerscope
a4729a8d12
Tweak layout on taxon filters
2014-07-09 16:15:27 +10:00
summerscope
263060611d
Search and filter styling and markup tweaks
2014-07-09 16:13:43 +10:00
Will Marshall
c8ee4a594c
Some text changes and similar magic
2014-07-09 16:10:08 +10:00
Will Marshall
242c03e753
Filter text logic
2014-07-09 16:03:20 +10:00
Will Marshall
6f3f40e2e6
Adding query string to search params
2014-07-09 15:45:05 +10:00
Will Marshall
95d519f0f1
No results option
2014-07-09 14:29:07 +10:00
Will Marshall
eb9ec1497c
Backwards
2014-07-09 14:26:42 +10:00
Will Marshall
fb8d7907f9
Rearchitecting the thing
2014-07-09 14:07:38 +10:00
Will Marshall
c640233ee5
Merge branch 'master' into laura_and_will
...
Conflicts:
app/assets/javascripts/darkswarm/filters/taxons.js.coffee
app/models/enterprise.rb
app/serializers/api/enterprise_serializer.rb
db/migrate/20140702053145_add_fields_to_distributors_shipping_methods.rb
db/schema.rb
spec/helpers/shared_helper_spec.rb
spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee
spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee
spec/javascripts/unit/darkswarm/services/taxon_spec.js.coffee
spec/models/enterprise_spec.rb
2014-07-09 11:40:54 +10:00
Will Marshall
30d78c8da3
Adding a spec to test a regression
2014-07-09 11:33:36 +10:00
Will Marshall
7d39c30dbd
Fixing a taxon bug
2014-07-09 10:54:40 +10:00
Will Marshall
0b27040dcb
Taxon selection finesse
2014-07-09 10:53:52 +10:00
summerscope
730fbc5e94
New texture for hubs background
2014-07-04 17:41:42 +10:00
summerscope
a62410389e
Producers index markup tweak for new sexy search
2014-07-04 17:38:04 +10:00
summerscope
b0a2dba5e1
Tweaks to markup for new big sexy search
2014-07-04 17:36:56 +10:00
summerscope
72203c0ad0
Refactoring home fat view to make CTA Button more intuitive
2014-07-04 17:34:51 +10:00
summerscope
ac5c8ccfd4
Modal styling for active table removing background
2014-07-04 17:34:26 +10:00
summerscope
9ed0ebaa43
Hubs styling for bit sexy search
2014-07-04 17:33:02 +10:00
summerscope
5d2d4fd007
More styling adjustments for big sexy search
2014-07-04 17:32:43 +10:00
Rohan Mitchell
ba964d54d9
Update spree and spree_auth_devise
2014-07-04 17:07:58 +10:00
summerscope
56a1a66d3f
Styling for big sexy search bar
2014-07-04 17:00:03 +10:00
summerscope
b50541fd15
Less padding below search bar
2014-07-04 15:50:00 +10:00
summerscope
8186773adb
Adjustments to filters markup
2014-07-04 15:49:23 +10:00
summerscope
7f00f66e82
Styling for filter systems against search
2014-07-04 15:47:51 +10:00
Will Marshall
eb8f59d65b
Tests for the taxon filtering
2014-07-04 15:19:45 +10:00
Rohan Mitchell
470ae7e729
Fix unreliable spec
2014-07-04 14:39:27 +10:00
Rohan Mitchell
30262e1969
Clean up specs, fix broken spec, remove JS log
2014-07-04 14:39:27 +10:00
Rohan Mitchell
f8572db683
Install and configure dalli for staging and production environments
2014-07-04 14:39:27 +10:00
Rohan Mitchell
8b67fc4d61
Make DSM timestamp columns NOT NULL
2014-07-04 14:39:27 +10:00
Rohan Mitchell
ae0392b383
Fix spec fail with taxons by id
2014-07-04 14:39:27 +10:00
Rohan Mitchell
94902268e2
Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.
2014-07-04 14:39:27 +10:00
Rohan Mitchell
206275b794
Code cleanups
2014-07-04 14:39:27 +10:00
Rohan Mitchell
da4a00c720
Remove ruby- prefix from .ruby-version, turn off Travis email notifications
2014-07-04 14:39:27 +10:00
Rohan Mitchell
8f6a2575b7
Minor code formatting changes
2014-07-04 14:39:26 +10:00
Will Marshall
c57148340c
Fixing spec regression
2014-07-04 14:39:26 +10:00
Will Marshall
6d4dfad336
OK address no longer being lazy-loaded
2014-07-04 14:39:26 +10:00
Will Marshall
0177a56408
Caching address and touching enterprise on save
2014-07-04 14:39:26 +10:00
Will Marshall
61d8be3ddc
Removing old file, renaming one to match naming conventions
2014-07-04 14:39:26 +10:00
Will Marshall
74f29f8c74
Tweaking spec names
2014-07-04 14:39:26 +10:00
Will Marshall
1f6641766d
Restoring Producers page
2014-07-04 14:39:26 +10:00
Will Marshall
23034a55d4
Adding tests and full touch behaviour for caching
2014-07-04 14:39:26 +10:00
Will Marshall
3195e20b65
cleaning up touches
2014-07-04 14:38:27 +10:00
Will Marshall
24d3abf6d5
Adding dereferencing to taxons and reducing our data-set
2014-07-04 14:38:27 +10:00
Will Marshall
4a116570d1
adding by producer id filtering
2014-07-04 14:38:27 +10:00
Will Marshall
e858c0d434
Moving taxon filter to ID instead of name
2014-07-04 14:38:27 +10:00
Will Marshall
8b98c72336
Adding all the Angular filters required to make this work
2014-07-04 14:38:27 +10:00
Will Marshall
8b439c4e69
Temporary/demonstration caching behaviour, INCOMPLETE
2014-07-04 14:38:27 +10:00
Will Marshall
f335b6a576
Taxon selectors and show/hide behaviour
2014-07-04 14:09:53 +10:00
Rob H
3da2461af5
Require shipping methods to have at least one distributor
2014-07-04 14:05:44 +10:00
Will Marshall
ca6068c095
Fixing a borked test
2014-07-04 13:51:24 +10:00
Maikel Linke
5459a54ada
Adding perftools.rb
...
perftools.rb can profile your code. The spec_helper contains comments
about how to activate it.
2014-07-04 13:51:24 +10:00
Will Marshall
fab96b58a7
Fixing spec regression
2014-07-04 13:51:23 +10:00
Will Marshall
2f98da8eef
Caching address and touching enterprise on save
2014-07-04 13:51:23 +10:00
Will Marshall
a8fde53715
Removing old file, renaming one to match naming conventions
2014-07-04 13:51:23 +10:00
Will Marshall
22b5e152d1
Tweaking spec names
2014-07-04 13:51:23 +10:00
Will Marshall
17612f14f5
Adding tests and full touch behaviour for caching
2014-07-04 13:51:23 +10:00
Rohan Mitchell
514d7179a6
Revert "install script". Prototype script should not yet be on master.
...
This reverts commit 39012388a2 .
2014-07-04 13:51:23 +10:00
Will Marshall
b005d0860e
cleaning up touches
2014-07-04 13:51:23 +10:00
Will Marshall
487b8616c0
Adding dereferencing to taxons and reducing our data-set
2014-07-04 13:51:22 +10:00
Will Marshall
55bf59ba96
adding by producer id filtering
2014-07-04 13:51:22 +10:00
Will Marshall
1955048502
Moving taxon filter to ID instead of name
2014-07-04 13:51:22 +10:00
Will Marshall
f19a02264e
Adding all the Angular filters required to make this work
2014-07-04 13:51:22 +10:00
Will Marshall
79f42ccc61
Temporary/demonstration caching behaviour, INCOMPLETE
2014-07-04 13:51:22 +10:00
summerscope
9d9dd777c1
Add in simple text style for global use
2014-07-04 13:39:55 +10:00
summerscope
ab4b72b9c7
Styling to make the taxons sit right for 1 and 2 lines
2014-07-04 13:39:19 +10:00
summerscope
eed39fc971
Filters file in
2014-07-04 13:37:57 +10:00
Rob H
6a1f8dccfb
Merge branch 'master' into working
2014-07-04 12:03:23 +10:00
summerscope
698d1d2637
Add space to force line-height trigger on active table skinny view - producers page
2014-07-04 11:33:05 +10:00
summerscope
87c6feec97
Remove padding - tighten up fat view
2014-07-04 11:32:32 +10:00
summerscope
9060e18a81
Tweak timings on the modal animations
2014-07-04 11:32:09 +10:00
summerscope
ae8ae1fe41
Fix styling on hubs list to make accordion icons sit vertically aligned
2014-07-03 15:10:07 +10:00
summerscope
42c9dcf3de
Remove @include csstrans from all SASS to stop conflicts with ngAnimate classes
2014-07-03 14:55:39 +10:00
summerscope
06400c6202
Remove unused @include
2014-07-03 14:54:34 +10:00
Maikel Linke
ac54bf6b22
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork
2014-07-03 14:32:06 +10:00
Maikel Linke
e0119a3f1f
Adding perftools.rb
...
perftools.rb can profile your code. The spec_helper contains comments
about how to activate it.
2014-07-03 14:30:36 +10:00
Rob H
29fde37ba3
Merge branch 'bug-herd' into working
2014-07-03 14:24:39 +10:00
Rob H
569327ecce
Merge branch 'master' into working
2014-07-03 10:15:45 +10:00
Rafael Schouten
ef1b72cec9
Megalitres to Kilolitres
2014-07-03 00:07:57 +01:00
Rafael Schouten
e89b782787
Use Kilolitres instead of Megalitres. Megalitres are REALLY big!
2014-07-02 23:20:54 +01:00
Rohan Mitchell
570a33db5f
Revert "install script". Prototype script should not yet be on master.
...
This reverts commit 39012388a2 .
2014-07-02 14:54:13 +10:00
summerscope
0301a97bfe
Merge branch 'master' into laura_and_will
2014-07-02 14:45:11 +10:00
summerscope
75f3358e2a
Adding CTA button for crowdfunding site to homepage & countdown timer directive
2014-07-02 14:44:46 +10:00
summerscope
96b4d0f873
Fix grumpy typo
2014-07-02 12:26:32 +10:00
summerscope
23ae0806e7
Add email link for error messages on 500 page
2014-07-02 11:51:48 +10:00
Will Marshall
106c9f63bb
Adding animation hooks for Laura
2014-07-02 11:33:38 +10:00
Will Marshall
434e087a73
Merge branch 'master' into laura_and_will
2014-07-02 11:30:43 +10:00
Maikel Linke
35bcebc823
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork
2014-06-28 19:43:01 +10:00
Maikel Linke
39012388a2
install script
2014-06-28 19:41:45 +10:00
summerscope
9791374204
Add partial to producers index page
2014-06-27 17:27:46 +10:00
summerscope
9d397430d4
Add styling for filters block
2014-06-27 17:27:19 +10:00
summerscope
9f71ccc3c0
Filters partial for search field
2014-06-27 17:26:52 +10:00
summerscope
fe11e50d3b
Adding graphics for error message pages
2014-06-27 15:51:22 +10:00
summerscope
0291723239
Tweak layout and message for 500
2014-06-27 15:50:55 +10:00
summerscope
9edec0c849
Tweak layout and message for 422
2014-06-27 15:50:45 +10:00
summerscope
1dc0b1bc2f
Tweak layout and message for 404
2014-06-27 15:50:33 +10:00
Will Marshall
ce3cb7890b
Removing old product modal
2014-06-27 15:16:08 +10:00
Will Marshall
f316b8dec5
Adding product modals in new format
2014-06-27 15:15:41 +10:00
Will Marshall
7b673870cd
Adding bulk icons
2014-06-27 15:04:56 +10:00
Will Marshall
e8ba36041b
Tests and patch for group filter
2014-06-27 15:01:12 +10:00
Will Marshall
8bd8d811b1
Unbreaking the groups page
2014-06-27 14:51:55 +10:00
Will Marshall
e4c8c19fea
Tweaking the producer modal
2014-06-27 14:39:50 +10:00
Will Marshall
03c84cbfe5
Fixing missing taxon icons
2014-06-27 14:39:50 +10:00
Rohan Mitchell
5a235be110
Fix regressed JS spec
2014-06-27 11:56:09 +10:00
Rohan Mitchell
aa5767cd30
Remove paypal image button from checkout, fix redirect to paypal
2014-06-27 11:52:36 +10:00
Rohan Mitchell
4075854440
Navigation.go supports full URLs
2014-06-27 11:51:53 +10:00
Rohan Mitchell
b678a2f7fd
Move navigation spec to services dir
2014-06-27 11:34:02 +10:00
Rob H
083fda0ad0
Set columns on BPE error messages
2014-06-27 10:46:54 +10:00
Will Marshall
f8d51c3105
Fixing intermittent spec failure
2014-06-26 15:43:33 +10:00
Will Marshall
821724b01e
Merge branch 'master' into laura_and_will
2014-06-26 15:33:51 +10:00
Will Marshall
8480cf7866
Tab fixes, new tests, reworking modals
2014-06-26 15:32:55 +10:00
Rob H
934f960336
Add display as to new product page
2014-06-26 15:27:24 +10:00
Will Marshall
9eb43e6c09
Removing visible scopes from enteprise distributors and producers
2014-06-26 15:26:15 +10:00
Will Marshall
9755bd2251
Refactoring slightly
2014-06-26 15:17:19 +10:00
Will Marshall
ed6bb2275a
Fixing some regressions in tests, switching favicons
2014-06-26 15:04:32 +10:00
Will Marshall
0b8ca9af47
Adding visibility filtering to map
2014-06-26 14:49:40 +10:00
Will Marshall
a4e675e675
Refactoring visibility handling
2014-06-26 14:48:46 +10:00
Will Marshall
8862fd555c
Removing ng-animate, changing our enterprise restriction
2014-06-26 14:36:16 +10:00
Rob H
44fb34d7be
Rearrange admin title
2014-06-26 12:20:42 +10:00
Will Marshall
a1789a8058
Removing old serializers
2014-06-26 12:17:38 +10:00
summerscope
fdb1c64c63
Merge branch 'master' into laura_and_will
2014-06-26 11:16:42 +10:00
Will Marshall
9667b84c5c
Finishing the transition to AMS from RABL
2014-06-26 11:07:53 +10:00
Will Marshall
8baf32f926
Merge branch 'master' into enterprise-json-perf
2014-06-25 16:31:16 +10:00
Will Marshall
a49fe2bf65
Fixing a regression bug
2014-06-25 16:30:23 +10:00
summerscope
881c229855
Prevents turquoise color text on red button
2014-06-25 15:21:37 +10:00
Will Marshall
33b5359a16
Spiking AMS implementation of data
2014-06-25 15:18:13 +10:00
Will Marshall
9cb6987645
Refactoring the supplied_taxons query to use SQL
2014-06-25 15:18:00 +10:00
Will Marshall
b1f275dac8
Adding enterprises to cart to prevent errors being thrown
2014-06-25 14:38:16 +10:00
Rohan Mitchell
3687479c22
Fetch distributed_taxons in SQL
2014-06-25 14:33:19 +10:00
summerscope
e14470ad77
Fix placeholder text to reference Producer rather than Hub
2014-06-25 14:16:42 +10:00
Will Marshall
2c6e239962
Adding some basic animations, upgrading Angular Foundation
2014-06-25 13:59:22 +10:00
Will Marshall
5f242f9232
Fixing groups page anchor scrolling
2014-06-25 10:46:32 +10:00
Will Marshall
edd9d93b8c
Merge branch 'master' into laura_and_will
...
Conflicts:
app/assets/javascripts/templates/partials/enterprise_header.html.haml
app/views/shopping_shared/_contact.html.haml
spec/features/consumer/home_spec.rb
2014-06-24 17:16:22 +10:00
Will Marshall
4f3d468db6
Dereferencing groups and adding modals to page
2014-06-24 17:15:31 +10:00
Will Marshall
369761ccc5
Minor regression bug
2014-06-24 17:15:31 +10:00
Will Marshall
c09555e380
Tab fixes, new tests, reworking modals
2014-06-24 17:15:31 +10:00
Will Marshall
b3f0cb1e74
Bunch of minor bugfixes
2014-06-24 17:14:01 +10:00
summerscope
31529f0343
Make text links turquoise color for producers page
2014-06-24 16:58:01 +10:00
summerscope
ff344533d9
Remove link for follow links on CONTACT for shopfront mini menu (tabs) - should be icon only
2014-06-24 16:51:58 +10:00
Will Marshall
64cca8cf36
Enabling map on production
2014-06-24 16:01:06 +10:00
summerscope
44d9104200
New favicon for staging and production versions of site
2014-06-24 15:47:27 +10:00
Will Marshall
a9ce36d402
Minor regression bug
2014-06-24 14:15:15 +10:00
Will Marshall
c0ac3c1b14
Tab fixes, new tests, reworking modals
2014-06-24 14:09:21 +10:00
Will Marshall
5c220ca30f
Merge branch 'master' into laura_and_will
2014-06-24 14:08:57 +10:00
Will Marshall
11872931a5
Bunch of minor bugfixes
2014-06-24 14:08:13 +10:00
summerscope
563e605ad0
Tweak styling for text message on shopfront
2014-06-24 13:58:59 +10:00
summerscope
a93a1a07cf
Tweak styling for closed shoptfront
2014-06-24 13:50:18 +10:00
summerscope
a36408e2a1
Tweak overflow for modal ABOUT styling so that browser never tries to add a horizontal scroll bar
2014-06-24 13:35:00 +10:00
summerscope
d0b2f73c5a
Tweak markup for PRODUCERS tab on mini menu
2014-06-24 13:25:45 +10:00
summerscope
e0f5f51f92
Tweak markup for GROUPS tab on mini menu
2014-06-24 13:25:27 +10:00
summerscope
902d896218
Tweak markup for CONTACT tab on mini menu
2014-06-24 13:25:13 +10:00
summerscope
703ee5e566
Tweak markup for ABOUT tab on mini menu
2014-06-24 13:24:56 +10:00
summerscope
a498ffb5a7
Add styles to improve the mini menu / tabs area of the shopfront and make it more consistent
2014-06-24 13:24:33 +10:00
summerscope
e8bf2da69c
Tweak small hero image styling
2014-06-24 13:24:11 +10:00
Will Marshall
f7ba8cade0
Bunch of minor bugfixes
2014-06-24 13:01:51 +10:00
Rob H
9099fca11c
Merge branch 'bug-herd' into working
2014-06-23 22:01:41 +10:00
Rob H
51d3f65934
Remove spree's product tab for all but admin users
2014-06-23 22:01:19 +10:00
Rob H
753a867142
'Back to Products List' on product edit page returns user to BPE
2014-06-23 15:54:53 +10:00
Rob H
7d1acc23ad
Cancel button on new product form redirects to BPE
2014-06-23 15:54:14 +10:00
Rob H
9b126df5b6
Add variant display_name to reports
2014-06-23 14:31:16 +10:00
Rob H
a21c2c20f7
Change 'Spree' in admin page title to 'OFN'
2014-06-23 11:26:46 +10:00
Rob H
c56e0dfdae
Add Laura to Readme
2014-06-23 10:52:23 +10:00
Rob H
3b0bf9c677
Amend readme
2014-06-23 10:27:43 +10:00
Rob H
a7cd6def4f
Amend readme
2014-06-23 10:25:52 +10:00
Will Marshall
3fc337299b
Adding ponies and filtering
2014-06-20 17:14:05 +10:00
Rob H
0785509bc4
Add plus icon to new order cycles button
2014-06-20 17:00:36 +10:00
Rob H
9f285b1d8c
Add plus icon to new enterprises button
2014-06-20 17:00:07 +10:00
Rob H
a448ccdad4
Remove unused enterprise show page
2014-06-20 16:53:04 +10:00
Will Marshall
1eaf2c3bc5
Fixing missing taxons
2014-06-20 16:50:31 +10:00
Rob H
d71966b5c0
Change show link to edit link on admin enterprises index
2014-06-20 16:39:09 +10:00
Rob H
4b437e2ab5
Realign enterprises social media form components
2014-06-20 16:38:10 +10:00
Will Marshall
21589fd5b0
Hack patching home page modals
2014-06-20 16:31:49 +10:00
Will Marshall
1ed634239d
Major refactoring
2014-06-20 16:31:49 +10:00
Rob H
d6341b65e5
Add edit button to Order cycles index
2014-06-20 16:22:55 +10:00
Rob H
1a0a8ec160
Merge branch 'master' into working
2014-06-20 13:54:52 +10:00
Will Marshall
8bb5f75ea0
Temporary fix to get staging working
2014-06-20 13:51:21 +10:00
Rob H
1f72bade65
Changing promo image explanation text
2014-06-20 13:47:33 +10:00
Rob H
3d1927d545
Merge branch 'master' into working
2014-06-20 12:29:47 +10:00
Rob H
a668a4fd55
Further tidy-up for order confirmation email
2014-06-20 12:21:33 +10:00
Will Marshall
c955bf61ac
Reverting the main_app changes
2014-06-20 12:11:00 +10:00
Will Marshall
ba842be5b8
Loading enterprises per-view again
2014-06-20 12:03:51 +10:00
Will Marshall
17521516b4
Patching up some regressions with the tabs
2014-06-20 11:33:30 +10:00
Will Marshall
b0d88c071a
Merge branch 'laura_and_will'
2014-06-20 10:49:31 +10:00
Will Marshall
c97fa711b7
Adding config changes to app.rb, fixing mixing producers links
2014-06-20 10:47:46 +10:00
summerscope
a362c2591f
Remove parentheses from address on button
2014-06-20 10:42:52 +10:00
summerscope
9a59f6b520
Remove parentheses from address on button
2014-06-20 10:36:09 +10:00
summerscope
5a005d944b
Remove parentheses from address on button
2014-06-20 10:35:58 +10:00
summerscope
521030a8a5
Tweak background color to taxons
2014-06-20 10:35:11 +10:00
summerscope
f4fc0beb36
Styling about on hub shopfront page
2014-06-20 10:34:46 +10:00
summerscope
23542136ed
Add a small hero image class
2014-06-20 10:34:04 +10:00
Will Marshall
db158a16d4
Merge branch 'laura_and_will'
2014-06-20 10:33:44 +10:00
summerscope
93dbfdab3f
Tweak menu styling to make logo sit in center of container
2014-06-20 10:22:54 +10:00
summerscope
620c7f1cf8
Tweak taxon background color so it shows up against white
2014-06-20 10:22:36 +10:00
summerscope
3a1bf24a86
Product modal adjust markup for SVG icon styling
2014-06-20 10:00:54 +10:00
summerscope
f87b2ea1e3
Producer hubs view - fat node - adjust markup to make more dynamic, adjust for new designs
2014-06-20 10:00:36 +10:00
summerscope
48292be98b
Home hubs view - fat node - adjust markup to make more dynamic, adjust for new designs
2014-06-20 10:00:16 +10:00
summerscope
bf61d70e8f
Adjust producer active table styles to accomodate new fat view markup
2014-06-20 09:59:32 +10:00
summerscope
9b25cfe67b
Adjust active table styles to accommodate new fat view markup
2014-06-20 09:59:11 +10:00
summerscope
e4f4db82da
Tweak markup for producer modal
2014-06-20 09:58:49 +10:00
summerscope
6d20b16c3c
Tweak markup for map modal
2014-06-20 09:58:32 +10:00
summerscope
5b2e45b9ba
More styling for modals for map view for hubs and producers
2014-06-20 09:58:06 +10:00
summerscope
0fa15750a1
Styling for modals - move the X to close icon inside canvas on small devices
2014-06-20 09:57:48 +10:00
summerscope
b1787ad65c
Add in styling for product modal version of taxons
2014-06-20 09:57:18 +10:00
summerscope
b6ab46bcf8
Move style from modal css to typography for general use
2014-06-20 09:56:55 +10:00
Rob H
2861191ab7
Merge branch 'sm-desc' into working
2014-06-20 09:43:58 +10:00
Will Marshall
bffe036990
Merge branch 'laura_and_will'
2014-06-19 21:29:15 +10:00
Will Marshall
f8da754372
Patching Rabl helper
2014-06-19 21:26:51 +10:00
Rob H
0d7c682b85
Remove shipping category from admin edit shipping methods
2014-06-19 18:31:52 +10:00
Rob H
0527900453
Change text of OC collection details
2014-06-19 18:02:05 +10:00
Rob H
3c24be3c0b
Change text of OC delivery instructions placeholder
2014-06-19 17:57:23 +10:00
Rob H
bd13b2b3fc
Add shipping method description to confirmation email, cleanup
2014-06-19 17:52:25 +10:00
summerscope
c141707ef6
Adding some styles for fat view on active table - needs to be pulled out to hub_node.css.sass WIP commit
2014-06-19 17:09:02 +10:00
summerscope
5984a233ec
Tweaking styles for producer node to allow for new CTA link row WIP commit
2014-06-19 17:08:24 +10:00
summerscope
cdbcf733e3
Tweaking styles for hub node to allow for new CTA link rwo
2014-06-19 17:07:58 +10:00
summerscope
bc7bf36c9d
Tweaking styles for active table to allow for new CTA link rwo
2014-06-19 17:07:39 +10:00
summerscope
6a350e4867
Tweak order of classes
2014-06-19 17:07:16 +10:00
summerscope
d1b6a7b2a2
Adjusting markup for active table producer fat view WIP commit
2014-06-19 17:06:38 +10:00
summerscope
7c5dc397b9
Adjusting markup for active table hub fat view for new layout
2014-06-19 17:06:16 +10:00
Rob H
df660ff536
Adding shipping method description to checkout
2014-06-19 16:34:28 +10:00
summerscope
591441b968
Making a js change to remove hub name from shipping method label
2014-06-19 16:31:11 +10:00
summerscope
238c783e77
Style writing for enterprise modals
2014-06-19 16:30:50 +10:00
summerscope
3747306c31
Styling for producer modal on map
2014-06-19 16:30:36 +10:00
summerscope
c50426328e
Styling for hub modal on map
2014-06-19 16:30:22 +10:00
summerscope
3fef2e8ada
Changing name of classes to be less contextual and more reusable
2014-06-19 16:29:43 +10:00
summerscope
5319ad8846
Changing name of classes to be less contextual and more reusable
2014-06-19 16:29:28 +10:00
Rob H
9135a8f27b
Change 'ready on' to 'ready for'
2014-06-19 16:28:16 +10:00
summerscope
e74ee3c6d5
Generic modal styling and options
2014-06-19 15:42:35 +10:00
summerscope
4c160ac83f
Changing markup for CONTACT section of enterprise modal
2014-06-19 15:42:35 +10:00
summerscope
b68d038dd0
Markup adjustments for producer modal on map view - styling all the things! making things dynamic to show and hide
2014-06-19 15:42:35 +10:00
summerscope
ee38bc70b2
Renaming stylesheet for naming consistancy
2014-06-19 15:42:35 +10:00
summerscope
a1f1654e95
Renaming stylesheet for naming consistency
2014-06-19 15:42:34 +10:00
summerscope
a74766909a
Adding a stylesheet specifically for enterprises e.g. hubs and producers
2014-06-19 15:42:34 +10:00
summerscope
ce28e286da
Make the rabl capture phone number at enterprise level
2014-06-19 15:42:33 +10:00
Will Marshall
a4d12c4515
Patching up IE warning
2014-06-19 15:18:14 +10:00
Will Marshall
24f147d81d
Adding pickup and delivery
2014-06-19 14:38:05 +10:00
Will Marshall
34e2170faf
Patching some regressions
2014-06-19 14:36:47 +10:00
Will Marshall
6e5e202461
Merge branch 'master' into laura_and_will
...
Conflicts:
app/assets/javascripts/darkswarm/services/map_modal.js.coffee
app/assets/javascripts/darkswarm/services/product.js.coffee
app/assets/javascripts/templates/map_modal_hub.html.haml
app/assets/javascripts/templates/map_modal_producer.html.haml
app/assets/javascripts/templates/partials/contact.html.haml
app/views/home/_fat.html.haml
spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
2014-06-19 14:22:23 +10:00
Will Marshall
a7f4256897
Fixing a minor regression
2014-06-19 14:19:15 +10:00
Will Marshall
4684c92c6e
Minor refactoring from code review with Rohan
2014-06-19 14:19:14 +10:00
summerscope
5fc95462bf
Tweak IE old warning css to remove css anims (not supported old browsers anyway)
2014-06-19 14:19:14 +10:00
summerscope
fbe56ce3d6
Tweak IE old warning message for stakeholder feedback
2014-06-19 14:19:14 +10:00
summerscope
aa88eeac72
Changing Producer modal markup to reflect new design. WIP commit,
2014-06-19 14:19:14 +10:00
summerscope
add89ffb47
Update images styling to make more generic / modular and remove styling specific to producers to make more scalable.
2014-06-19 14:19:14 +10:00
summerscope
50ac838e19
Update follow markup to reflect new design WIP commit
2014-06-19 14:19:13 +10:00
summerscope
a5e412fbe9
Update contact markup to reflect new design
2014-06-19 14:19:13 +10:00
summerscope
9b532205e5
Changing markup to Hub modal (map) to reflect new design
2014-06-19 14:19:13 +10:00
summerscope
abb64531a7
Adding stylesheet to manage modals for Hubs and Producers
2014-06-19 14:19:13 +10:00
Will Marshall
841621a56f
Further patches to the damned RABL system, patching everything up to use our new Service structure
2014-06-19 14:19:13 +10:00
summerscope
60bd89533e
Turn off IE message ready for logic
2014-06-19 14:19:13 +10:00
summerscope
f463f71fb7
Add browser logos for IE message
2014-06-19 14:19:12 +10:00
summerscope
f601ad21a2
Update markup to include links to modern browsers for upgrade
2014-06-19 14:19:12 +10:00
summerscope
b1cf64d290
Styling for old IE upgrade / warning message
2014-06-19 14:19:12 +10:00
Will Marshall
e5c62e6c59
Refactoring JSON injection a bit further
2014-06-19 14:19:12 +10:00
Will Marshall
35d5dde5aa
Adding dereferencing on construct to Enterprises service - this is MAGIC
2014-06-19 14:19:11 +10:00
Will Marshall
a2965696da
Refactoring the RABL injection and the Hubs/Producers/Enterprises services
2014-06-19 14:19:11 +10:00
Will Marshall
c8384f1a71
Reworking the RABL templates for simplicity AND fixing up all the tests
2014-06-19 14:19:11 +10:00
summerscope
b7e19ca290
Tweak styling and add animation-in function for Loading text message
2014-06-19 14:19:11 +10:00
Will Marshall
0909162424
Changing our composition of producers and hubs
2014-06-19 14:19:11 +10:00
Will Marshall
75366b96e1
Reworking the empties cart and active table link stuff
2014-06-19 14:19:10 +10:00
Will Marshall
b195ac3a84
Changing icon markup
2014-06-19 14:19:10 +10:00
Will Marshall
653da728c6
Starting a set of small functional changes
2014-06-19 14:19:10 +10:00
summerscope
f6c46d4707
Tweak label until shipping methods are available
2014-06-19 14:19:10 +10:00
summerscope
2cbcbed644
Site tagline constrain width on large screens to improve text flow
2014-06-19 14:19:10 +10:00
summerscope
53aaf6bff3
Making input label in shopfront small to distinguish from variant name and price
2014-06-19 14:19:10 +10:00
Will Marshall
d20c952595
fixing issue 750
2014-06-19 14:19:09 +10:00
summerscope
4a053a50ea
New animation mixin
2014-06-19 14:19:09 +10:00
summerscope
8c6e0c6b18
Remove SVG styling from this scss - now in taxons.css.sass
2014-06-19 14:19:09 +10:00
summerscope
397d15999f
Remove SVG styling from this scss - now in taxons.css.sass
2014-06-19 14:19:09 +10:00
summerscope
f3ca82ec8e
New stylesheet to style taxon SVG icons
2014-06-19 14:19:09 +10:00
Will Marshall
ce1732db27
Adding taxon preview (big) to the admin UI
2014-06-19 14:18:52 +10:00
Will Marshall
7f4816c9a5
Adding new producer modal and dereferencing shopfront
2014-06-19 14:00:37 +10:00
Will Marshall
9951f668e8
Adding 180x180 size to logo
2014-06-19 13:00:28 +10:00
Will Marshall
36451423ba
Producer fat view
2014-06-19 12:56:55 +10:00
Will Marshall
3c7f5e9158
Adding new mechanism to hubs/fat
2014-06-19 12:54:06 +10:00
Will Marshall
b8cc2de91e
Merge branch 'master' into laura_and_will
...
Conflicts:
db/schema.rb
2014-06-19 12:49:58 +10:00
Will Marshall
f1c4ee6744
Fixing up hub modal
2014-06-19 12:49:28 +10:00
Will Marshall
3b4e600599
Changing producer to enterprise
2014-06-19 12:39:35 +10:00
Will Marshall
58e810a736
Using enterprise in modals
2014-06-19 12:38:30 +10:00
Will Marshall
738fdfcd49
Merge branch 'laura_and_will'
2014-06-19 12:11:12 +10:00
Will Marshall
8fcc2b0c62
Merge branch 'refactoring_services' into laura_and_will
2014-06-19 12:10:28 +10:00
Will Marshall
5d71af7687
fixing issue 750
2014-06-19 12:10:26 +10:00
Will Marshall
8905b45333
Fixing a minor regression
2014-06-19 12:10:05 +10:00
Will Marshall
b9561ecf20
Minor refactoring from code review with Rohan
2014-06-19 11:41:24 +10:00
summerscope
47775b13fc
Tweak IE old warning css to remove css anims (not supported old browsers anyway)
2014-06-19 11:32:30 +10:00
summerscope
b0b8e14adb
Tweak IE old warning message for stakeholder feedback
2014-06-19 11:30:41 +10:00
Rohan Mitchell
2f2e0d41af
On customer reports, do not show orders through a hub that the current user does not manage
2014-06-19 10:35:32 +10:00
Rohan Mitchell
3b7fc9f105
Reword spec descriptions
2014-06-19 10:03:05 +10:00
summerscope
710abf96eb
Changing Producer modal markup to reflect new design. WIP commit,
2014-06-18 18:53:31 +10:00
summerscope
a62ab98f53
Update images styling to make more generic / modular and remove styling specific to producers to make more scalable.
2014-06-18 18:53:02 +10:00
summerscope
f89418c0d6
Update follow markup to reflect new design WIP commit
2014-06-18 18:52:29 +10:00
summerscope
54983845c4
Update contact markup to reflect new design
2014-06-18 18:52:07 +10:00
summerscope
fcd0096843
Changing markup to Hub modal (map) to reflect new design
2014-06-18 18:50:59 +10:00
summerscope
e924d8d5dc
Adding stylesheet to manage modals for Hubs and Producers
2014-06-18 18:50:40 +10:00
Will Marshall
c02c7cf7ca
Further patches to the damned RABL system, patching everything up to use our new Service structure
2014-06-18 17:54:13 +10:00
summerscope
2dcdd997a2
Turn off IE message ready for logic
2014-06-18 17:14:20 +10:00
summerscope
83e7225ef8
Add browser logos for IE message
2014-06-18 17:11:57 +10:00
summerscope
4d6a92dfe4
Update markup to include links to modern browsers for upgrade
2014-06-18 17:11:08 +10:00
summerscope
2acf3bf382
Styling for old IE upgrade / warning message
2014-06-18 17:10:47 +10:00
Will Marshall
224a70c11f
Refactoring JSON injection a bit further
2014-06-18 16:43:57 +10:00
Rohan Mitchell
4eee7d4901
Enterprise user can manage their enterprises' producer properties
2014-06-18 16:04:41 +10:00
Will Marshall
45404f1475
Adding dereferencing on construct to Enterprises service - this is MAGIC
2014-06-18 15:48:24 +10:00
Rohan Mitchell
cf4e7b18b4
Redirect to enterprises index page after updating producer properties
2014-06-18 15:43:22 +10:00
Will Marshall
deb6c8a05a
Refactoring the RABL injection and the Hubs/Producers/Enterprises services
2014-06-18 15:40:02 +10:00
Rohan Mitchell
c3cec34186
Redirect to enterprises page after updating producer properties
2014-06-18 15:28:41 +10:00
Rohan Mitchell
e6674d43fa
Admin can reorder producer properties
2014-06-18 15:28:41 +10:00
Rohan Mitchell
27fa93dbb4
Admin can remove producer properties
2014-06-18 15:28:41 +10:00
Rohan Mitchell
94c42abf56
Admin can update producer properties
2014-06-18 15:28:41 +10:00
Rohan Mitchell
84cd56cfdc
Admin can list and create producer properties
2014-06-18 15:28:41 +10:00
Rohan Mitchell
92e3546a76
Retrieve properties for a product as a hash
2014-06-18 15:22:03 +10:00
Rohan Mitchell
0139c4bda2
Set producer property
2014-06-18 15:22:03 +10:00
Rohan Mitchell
9d8629f41f
Add producer property model
2014-06-18 15:22:02 +10:00
Rob H
6809d70397
Redirect user back to enterprise edit page after saving
2014-06-18 13:18:33 +10:00
Will Marshall
e7c301da83
Reworking the RABL templates for simplicity AND fixing up all the tests
2014-06-18 13:05:44 +10:00
Rob H
65a0e4707a
Add text which explains cropping of promo image
2014-06-18 12:58:32 +10:00
Rob H
3884b0cc1b
Adding a direct link to shopfront to enterprise edit page for distributor enterprises
2014-06-18 12:37:26 +10:00
summerscope
e200b192d4
Tweak styling and add animation-in function for Loading text message
2014-06-18 12:37:11 +10:00
Rob H
45b16d52dd
Add visible checkbox to enterprises index page to allow bulk editing of visibility
2014-06-18 11:44:47 +10:00
Rob H
2e749ef1f3
Move admin enterprises index to haml
2014-06-18 11:08:00 +10:00
Rob H
0611947306
Merge branch 'master' into sm-makeover
2014-06-18 10:39:40 +10:00
Rob H
bd41ee8b97
Commit schema version
2014-06-18 10:38:59 +10:00
Rob H
004548a4fe
Rearrange shipping method edit page
2014-06-18 10:21:21 +10:00
Will Marshall
f54834da01
Changing our composition of producers and hubs
2014-06-17 16:33:43 +10:00
Will Marshall
37fee5c316
Reworking the empties cart and active table link stuff
2014-06-17 16:33:31 +10:00
Will Marshall
57c5c2d411
Changing icon markup
2014-06-17 14:34:38 +10:00
Will Marshall
9bbfc0a393
Starting a set of small functional changes
2014-06-17 12:35:03 +10:00
Will Marshall
e697a544e5
Merge branch 'master' into laura_and_will
2014-06-17 11:45:04 +10:00
summerscope
80f26c7457
Tweak label until shipping methods are available
2014-06-17 10:50:47 +10:00
summerscope
923a615dfa
Site tagline constrain width on large screens to improve text flow
2014-06-14 21:00:32 +10:00
summerscope
5f155df42a
Making input label in shopfront small to distinguish from variant name and price
2014-06-13 14:32:06 +10:00
Will Marshall
17682dbc58
fixing issue 750
2014-06-13 14:31:55 +10:00
Will Marshall
d6098ec2de
Fixing a private method
2014-06-13 14:23:44 +10:00
summerscope
b069311475
New animation mixin
2014-06-13 14:20:58 +10:00
summerscope
f1497c9c5a
Remove SVG styling from this scss - now in taxons.css.sass
2014-06-13 14:20:47 +10:00
summerscope
3f72c8601b
Remove SVG styling from this scss - now in taxons.css.sass
2014-06-13 14:20:31 +10:00
summerscope
cad8f8a7a8
New stylesheet to style taxon SVG icons
2014-06-13 14:20:10 +10:00
Will Marshall
3aa9501480
Adding main app
2014-06-13 14:13:16 +10:00
Will Marshall
f7c71568df
Merge branch 'laura_and_will'
...
Conflicts:
app/models/spree/variant_decorator.rb
db/schema.rb
spec/models/spree/product_spec.rb
spec/models/spree/variant_spec.rb
2014-06-13 12:42:14 +10:00
Will Marshall
415a4eff0a
Not pre-loading images and setting the map back to gifses
2014-06-13 11:05:32 +10:00
Will Marshall
bc93ce57e6
Smooth scrolling, svg support via directive
2014-06-13 11:00:28 +10:00
summerscope
6135fe0336
Revert producers list to standard bullet point list
2014-06-13 10:26:09 +10:00
summerscope
4fd1a3d77c
Remove SVG from styling - cannot reach it through iframe #document markup
2014-06-12 16:52:04 +10:00
summerscope
e090352c43
Styling for shopfront page to resize icons as SVGs
2014-06-12 16:51:32 +10:00
summerscope
e2f983b448
Icon update for update to icon font
2014-06-12 16:40:06 +10:00
summerscope
567855b13c
Adding in new icon for producers modal list
2014-06-12 16:39:35 +10:00
summerscope
2ff4883725
Update icon font to add Bulk icon and pop out icon
2014-06-12 16:22:54 +10:00
summerscope
f9ded4c616
Markup change for taxon to be spat out correctly in shopfront view
2014-06-12 16:22:54 +10:00
Will Marshall
365c14d4fe
Adding smooth scroll to hubses
2014-06-12 16:16:46 +10:00
Will Marshall
f6690cb8dd
Patching a minor bug in cart emptying
2014-06-12 16:13:52 +10:00
Will Marshall
a55e58d50c
Adding working scrolling to anchors
2014-06-12 16:13:51 +10:00
Will Marshall
7a062b0310
Reworking the variant display of units and names
2014-06-12 16:13:51 +10:00
Rob H
8412d740ff
Move distributors into sidebar for new & edit shipping methods screen
2014-06-12 16:10:30 +10:00
summerscope
1a4e3c20ad
Styling for new svg icons for taxons
2014-06-12 15:47:38 +10:00
Rohan Mitchell
98611c3672
Fix timing error in enterprise supplied products rabl spec
2014-06-12 15:21:35 +10:00
Rohan Mitchell
9ccdd3b4e0
Add reactive integrity test that soft-deleted variants are removed from order cycles
2014-06-12 14:59:27 +10:00
Rohan Mitchell
8cea6d53ed
Correctly designate primary_taxon_id as NOT NULL
2014-06-12 14:59:27 +10:00
Rohan Mitchell
b23430375c
Add migration to remove deleted variants from order cycles
2014-06-12 14:59:27 +10:00
Rohan Mitchell
0061caa8df
Do not show deleted products in order cycle admin
2014-06-12 14:59:27 +10:00
Rohan Mitchell
836a08606c
Product and variant deletion removes the product or variant from any order cycles
2014-06-12 14:59:27 +10:00
Rohan Mitchell
083220089f
WIP: Delete ExchangeVariants when product is soft-deleted
2014-06-12 14:59:27 +10:00
Rohan Mitchell
c21d5cc3dc
Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors.
2014-06-12 14:59:27 +10:00
Rohan Mitchell
88c41df201
BPE uses soft-delete for products
2014-06-12 14:59:27 +10:00
Rohan Mitchell
b970f54f53
Admin UI soft-deletes variants, not hard delete
2014-06-12 14:59:27 +10:00
Rohan Mitchell
9dc02e5eac
Add product soft-delete API action
2014-06-12 14:59:26 +10:00
Rohan Mitchell
e6c7acdff3
Add soft-delete method to variant
2014-06-12 14:59:26 +10:00
Rob H
4e98ee6e56
Remove sidebar from admin edit shipping methods
2014-06-12 14:48:36 +10:00
summerscope
8acbfba873
Change z index of icon so it sits behind fixed menu at top
2014-06-12 13:03:39 +10:00
Will Marshall
901cde73df
Adding not-null constraint
2014-06-12 12:58:40 +10:00
Rob H
be6a043aac
Move dynamic placeholder logic to directive so that it can be used for master variants too
2014-06-12 12:58:40 +10:00
Rob H
0b1b260527
Adding dynamic text to display as placeholder
2014-06-12 12:58:39 +10:00
Rob H
7782745663
Add fields for variant display name and display as to bpe
2014-06-12 12:58:39 +10:00
Rob H
fa567ac607
Change variant name to display name
2014-06-12 12:58:10 +10:00
Rob H
9f681bd1ef
Use display_as as option value for variant when it is present
2014-06-12 12:57:56 +10:00
Rob H
721aeea130
OptionValueNamer spec refactor
2014-06-12 12:57:20 +10:00
Rob H
248c38fd2c
Adding name and display_as fields to variants
2014-06-12 12:56:44 +10:00
Rob H
1a91b5a728
Move option value naming logic into separate lib class
2014-06-12 12:55:53 +10:00
Rob H
3b1411283a
Merge branch 'master' into units
2014-06-12 12:13:44 +10:00
summerscope
176735544b
Changing class name to remove ofn- from naming convention which call the icon font styling
2014-06-12 12:12:25 +10:00
Rob H
c09aeeee8f
Recalculate option values on variants when product variant unit is changed
2014-06-12 12:11:20 +10:00
Will Marshall
349ba112d0
Fixing map issues, adding a nice pretty loader
2014-06-12 11:50:28 +10:00
Will Marshall
48e2c3512f
Patching a minor bug in cart emptying
2014-06-12 11:49:55 +10:00
Rohan Mitchell
4e6f07de8a
WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times
2014-06-12 11:49:55 +10:00
Rob H
c2109026ca
Add js spec for option value namer
2014-06-12 11:49:55 +10:00
Rohan Mitchell
71020a14ef
Fix payments coming up as $0, credit card charges failing for the same reason
2014-06-12 11:49:54 +10:00
Rob H
d9a5b02415
Move dynamic placeholder logic to directive so that it can be used for master variants too
2014-06-12 11:49:54 +10:00
Rohan Mitchell
908f7871bb
Orders and fulfilment report handles order cycles with nil opening or closing times
2014-06-12 11:49:54 +10:00
Rob H
5f8ed01475
Adding dynamic text to display as placeholder
2014-06-12 11:49:54 +10:00
Rob H
f688461e84
Add fields for variant display name and display as to bpe
2014-06-12 11:49:53 +10:00
Rob H
970b5f3061
Change variant name to display name
2014-06-12 11:49:53 +10:00
Rob H
2c78d537fa
Use display_as as option value for variant when it is present
2014-06-12 11:49:52 +10:00
Rob H
227c10288d
OptionValueNamer spec refactor
2014-06-12 11:49:52 +10:00
Rob H
c915c5fe78
Adding name and display_as fields to variants
2014-06-12 11:49:52 +10:00
Rob H
e9f2a8f2cd
Move option value naming logic into separate lib class
2014-06-12 11:49:52 +10:00
Rob H
c21342b82e
Adding all fields to new admin product spec
2014-06-12 11:49:51 +10:00
summerscope
860360d81e
Change map container name to remove ofn- which refers to icon font styling
2014-06-12 11:34:01 +10:00
Rohan Mitchell
a6e3dd65fe
WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times
2014-06-11 20:39:34 +10:00
Rob H
4d01b55963
Merge branch 'master' into units
2014-06-11 14:21:23 +10:00
Rob H
d8f1153817
Add js spec for option value namer
2014-06-11 14:21:13 +10:00
Rohan Mitchell
177e03eae2
Fix payments coming up as $0, credit card charges failing for the same reason
2014-06-11 13:19:14 +10:00
Rob H
8e960c817a
Merge branch 'master' into units
2014-06-11 12:43:40 +10:00
Rob H
44f4ee822c
Move dynamic placeholder logic to directive so that it can be used for master variants too
2014-06-11 12:41:51 +10:00
Rohan Mitchell
12809438ac
Orders and fulfilment report handles order cycles with nil opening or closing times
2014-06-11 10:33:59 +10:00
Will Marshall
82da4d3911
Fixing the taxon icons to support le svgs
2014-06-10 15:52:27 +10:00
Will Marshall
74b3c026d2
Merging in maps
2014-06-10 14:54:12 +10:00
Will Marshall
75f1bf4f54
Merging in master
2014-06-10 14:53:49 +10:00
Will Marshall
373f698676
Adding loading infrastructure
2014-06-10 14:52:27 +10:00
Will Marshall
94b7601d73
Patching authorization tests
2014-06-10 14:01:25 +10:00
Will Marshall
21b6e91913
Moving OFN flash to fixed block
2014-06-10 12:29:31 +10:00
Will Marshall
e806ffdd1a
Merge branch 'maps'
2014-06-10 11:17:14 +10:00
Will Marshall
4d7fa8b1bf
Removing payments when emptying order
2014-06-10 11:15:04 +10:00
Will Marshall
dbf4f503a9
Restoring my clever flash refactoring
2014-06-10 11:14:52 +10:00
Will Marshall
c07809d328
Rescoping the accordion as well
2014-06-10 11:14:52 +10:00
Rohan Mitchell
dc60409c85
Move paid column next to order totals
2014-06-10 10:31:53 +10:00
Will Marshall
c8520cedbb
Fixing another merge issue
2014-06-06 17:26:58 +10:00
Will Marshall
7953ff145c
Fixing a merge issue
2014-06-06 17:23:28 +10:00
Will Marshall
a87361d82e
Merge branch 'master' into maps
...
Conflicts:
app/assets/javascripts/darkswarm/services/map.js.coffee
app/assets/javascripts/templates/map_modal.html.haml
app/views/layouts/darkswarm.html.haml
app/views/map/index.html.haml
app/views/shared/menu/_large_menu.html.haml
config/routes.rb
2014-06-06 17:21:27 +10:00
Rohan Mitchell
f068cb3cd7
Show shipping method via angular only (don't show spree's adjustment)
2014-06-06 17:05:50 +10:00
Rohan Mitchell
be644bdcc3
Revert "Reworking flash messages hooray"
...
This reverts commit c9d0091cd9 .
2014-06-06 16:59:47 +10:00
Will Marshall
6c5b514b9b
Rescoping the accordion as well
2014-06-06 16:53:09 +10:00
Will Marshall
c9d0091cd9
Reworking flash messages hooray
2014-06-06 16:41:28 +10:00
Will Marshall
37f197205f
Removing shipping method from order when emptied
2014-06-06 16:39:53 +10:00
Rob H
6e04eeba07
Adding dynamic text to display as placeholder
2014-06-06 15:43:05 +10:00
Will Marshall
0c313c0dcb
Defaulting cart count to zero if undefined
2014-06-06 14:47:12 +10:00
Will Marshall
2545b06b2d
Adding first and last name read-only fields to credit card
2014-06-06 14:28:33 +10:00
Will Marshall
57102f714e
Switching to ng-if so CC fields aren't validated when hidden
2014-06-06 14:04:48 +10:00
Will Marshall
92eca72f4f
Fixing a couple of paths and clearing localStorage when changing distributor
2014-06-06 14:04:48 +10:00
Will Marshall
c32776c6b8
Disabling maps in production
2014-06-06 14:04:47 +10:00
Will Marshall
54cdc545a4
adding distributor id to localStorage
2014-06-06 14:04:47 +10:00
Will Marshall
afabda788e
Adding the close
2014-06-06 14:04:47 +10:00
Will Marshall
74b9810d22
Removing image from about us
2014-06-06 14:04:47 +10:00
Will Marshall
c09ffa832c
Fixing gmaps
2014-06-06 14:04:47 +10:00
Will Marshall
ebe40d3b3d
New icon
2014-06-06 14:04:46 +10:00
Will Marshall
f881197a74
New icons and some more enterprise data
2014-06-06 14:04:46 +10:00
Will Marshall
ddb5150e77
Automatically resizing to fit
2014-06-06 14:04:46 +10:00
Will Marshall
6f2e841100
Adding modals for the map
2014-06-06 14:04:46 +10:00
Will Marshall
c9c1b4709b
Basic but hacky way to get events out of map
2014-06-06 14:04:46 +10:00
Will Marshall
82ab14a33e
Starting on on the map
2014-06-06 14:04:45 +10:00
summerscope
0c501b58a5
Adjust layout for 12 column grid for Hub details and order cycle info plus adjust CSS to allow for different break points
2014-06-06 11:19:15 +10:00
Rob H
43c5c37326
Add fields for variant display name and display as to bpe
2014-06-06 10:10:41 +10:00
summerscope
8a87e5e545
Add in link to map page for homepage pane
2014-06-06 10:03:51 +10:00
Rohan Mitchell
634af96a66
Update reports controller spec for multi-order-cycle params
2014-06-06 09:47:16 +10:00
Rohan Mitchell
1d44cbf506
Show distribution charge on report
2014-06-06 09:47:16 +10:00
Rohan Mitchell
1a7b32d1ff
Show hub and customer name on total row
2014-06-06 09:47:16 +10:00
Rohan Mitchell
673293f273
Add extra shipping columns
2014-06-06 09:47:16 +10:00
Rohan Mitchell
13e2da42eb
Add producer column, remove Packed? and Shipped? columns
2014-06-06 09:47:16 +10:00
Rohan Mitchell
1fab8c1e01
In orders and fulfilment reports, rename distributor -> hub and supplier -> producer
2014-06-06 09:47:16 +10:00
Rohan Mitchell
e5f0818065
Order and fulfilment reports can filter by multiple hubs, producers and order cycles
2014-06-06 09:47:16 +10:00
Rohan Mitchell
f8fa014796
LineItem.supplied_by_any
2014-06-06 09:47:15 +10:00
Rohan Mitchell
590ac6aa6d
Put orders and fulfilment report in grid layout
2014-06-06 09:47:15 +10:00
Will Marshall
6c68937230
Fixing gmaps
2014-06-05 17:16:19 +10:00
Will Marshall
c75da1ce0d
New icon
2014-06-05 17:14:11 +10:00
Will Marshall
d85c89b5d2
Merge branch 'master' into maps
2014-06-05 17:12:40 +10:00
Will Marshall
8b1c2b1e9e
New icons and some more enterprise data
2014-06-05 17:12:38 +10:00
Will Marshall
b1b80a1e39
Automatically resizing to fit
2014-06-05 16:49:01 +10:00
Will Marshall
5ffb8decf5
Adding modals for the map
2014-06-05 16:23:43 +10:00
summerscope
3ae1eb863d
Update behaviour on Place Order Now button so it is disabled but not hidden when unavailable
2014-06-05 16:20:14 +10:00
summerscope
7b1756fc98
Fix column layout issue for checkout page making content expand beyond page boundaries
2014-06-05 16:19:35 +10:00
summerscope
68311ca699
Remove Facebook icon which appeared here - unnecessary.
2014-06-05 15:53:23 +10:00
summerscope
2984cada53
Remove Admin link from left menu as this now lives in the drop-down menu for logged in users under Cog icon to right.
2014-06-05 15:51:23 +10:00
Will Marshall
1ab0d6816c
Merge branch 'laura_and_will' into maps
2014-06-05 15:50:53 +10:00
Will Marshall
843ea9faef
Basic but hacky way to get events out of map
2014-06-05 15:08:50 +10:00
Rohan Mitchell
05c62634fc
Further overlapping elements fixes
2014-06-05 14:49:41 +10:00
Rohan Mitchell
2bedc431e8
Fix spec fragility - overlapping elements error
2014-06-05 13:43:41 +10:00
Rob H
1eac76fbba
Change variant name to display name
2014-06-05 13:39:53 +10:00
Will Marshall
476eeef69d
Starting on on the map
2014-06-05 12:18:26 +10:00
Rohan Mitchell
566afc0b75
Merge branch 'laura_and_will'
2014-06-05 11:42:02 +10:00
Rohan Mitchell
f28d9f9d9b
Fix distributor logo spec - Add a logo
2014-06-05 11:38:27 +10:00
Rohan Mitchell
4a7609a835
Basic styling for checkout credit card form
2014-06-05 11:17:53 +10:00
Will Marshall
fc02e7857a
Merge branch 'master' into laura_and_will
...
Conflicts:
app/views/shopping_shared/_contact.html.haml
2014-06-04 17:24:30 +10:00
Rob H
3240a4e08e
Use display_as as option value for variant when it is present
2014-06-04 17:23:11 +10:00
Will Marshall
69e5459afd
Finishing off the merge with localStorage refactoring with sekrets
2014-06-04 17:22:10 +10:00
summerscope
039108a07d
Styling label on taxons on fat view of active table for hubs (add a little padding to right)
2014-06-04 17:16:47 +10:00
Will Marshall
3c21ce8d99
Returning to the basic flash for now
2014-06-04 17:13:19 +10:00
Will Marshall
cd09f70ed3
Compacting down our flash messages
2014-06-04 17:13:19 +10:00
Will Marshall
874afb2d7e
Hiding image if not present
2014-06-04 17:13:18 +10:00
Will Marshall
5bd7485ca6
Restoring the image
2014-06-04 17:13:18 +10:00
Will Marshall
df7ee03cbf
Adding presenters to the social media fields
2014-06-04 17:13:18 +10:00
Will Marshall
d384b18d1b
Adding social media data to producers biatch
2014-06-04 17:13:18 +10:00
Will Marshall
a6a4d28072
Fixing up bugs in the Checkout form
2014-06-04 17:13:18 +10:00
Will Marshall
2c43d5960d
Patching up url formatting, still need to normalize this on backend
2014-06-04 17:12:17 +10:00
Will Marshall
d944c31d77
Showing a loading products thing
2014-06-04 17:12:16 +10:00
Will Marshall
59c433881e
Making the auto-closing more granular on checkout
2014-06-04 17:12:16 +10:00
summerscope
3d64f883a0
Fix issue with double up columns - delete duplicate
2014-06-04 17:12:05 +10:00
summerscope
825ec1bb63
Adding in icons to home hubs fat and skinny views
2014-06-04 17:09:50 +10:00
summerscope
8d24301c26
Changing shop link to correct /shop
2014-06-04 16:57:21 +10:00
Rohan Mitchell
fc3402bbd0
Determine whether to send card field attributes by payment method type
2014-06-04 16:55:27 +10:00
summerscope
c2a2f2b3b8
Adding icon for producers. Remove styling summary-header to distinguish between product and producer
2014-06-04 16:51:43 +10:00
summerscope
cb5948047b
Adding new icons into producer modal. Making it pretty
2014-06-04 16:50:51 +10:00
summerscope
54a70d9b08
Adding new icons into hubs fat view. Making it pretty
2014-06-04 16:50:26 +10:00
Rohan Mitchell
6a8def3d76
Do not send attributes for card fields when no card is supplied
2014-06-04 16:30:57 +10:00
Rohan Mitchell
37c780ed70
WIP: Send credit card details to server on checkout
2014-06-04 16:20:48 +10:00
summerscope
814ee9847e
Adding a new partial for mobile menu (off canvas) to restyle items in dropdown in big menu
2014-06-04 16:09:15 +10:00
summerscope
33c276c7f7
Adding in new icon fonts to mobile menu partial
2014-06-04 16:08:16 +10:00
summerscope
122ab01ce4
Adding in new icon fonts to large menu partial
2014-06-04 16:08:02 +10:00
summerscope
498559f70d
Adding in new icon fonts to cart partial
2014-06-04 16:07:41 +10:00
summerscope
6e4de586a9
Adding in new icon fonts to signed out partial
2014-06-04 16:07:17 +10:00
summerscope
1e3c046368
Adding in new icon fonts to signed in partial
2014-06-04 16:07:02 +10:00
summerscope
77f847dcbe
Adding in new icon fonts to menu system. Adding drop down cog to simplify top menu.
2014-06-04 16:06:24 +10:00
Rob H
7f2b3d62f4
OptionValueNamer spec refactor
2014-06-04 15:39:04 +10:00
Rob H
f4c15bfc48
Adding name and display_as fields to variants
2014-06-04 15:21:31 +10:00
Rob H
1ed5dcf994
Merge branch 'master' into units
2014-06-04 15:07:28 +10:00
Rob H
8d87cfbc35
Move option value naming logic into separate lib class
2014-06-04 14:54:42 +10:00
Rohan Mitchell
a99e18990d
Readability
2014-06-04 14:27:17 +10:00
Rohan Mitchell
1ccfc46e50
Update primary taxons migration - take more care in setting the default primary taxon
2014-06-04 14:27:05 +10:00
Rob H
29fbf0438b
Adding all fields to new admin product spec
2014-06-04 11:42:42 +10:00
summerscope
62e8a913fa
Merge branch 'laura_and_will' into icon_font
2014-06-04 11:09:37 +10:00
summerscope
1a39b70a14
Merge branch 'master' into laura_and_will
2014-06-04 11:08:44 +10:00
Rohan Mitchell
d52c1fa5da
Revert "Do not show deleted products in order cycle admin"
...
This reverts commit 4e45a682fd .
2014-06-03 12:18:27 +10:00
summerscope
fc4e20ffd4
Adding new icons from new pretty icon font
2014-06-03 11:50:38 +10:00
summerscope
037769bfb1
Adding new icons from icon font
2014-06-03 11:50:17 +10:00
summerscope
a6a86612c7
Adding X from new icon font to modal
2014-06-03 11:48:11 +10:00
Rohan Mitchell
d4f65a63bb
Remove spec for removed image
2014-06-03 11:31:30 +10:00
Rohan Mitchell
4e45a682fd
Do not show deleted products in order cycle admin
2014-06-03 11:29:54 +10:00
Rohan Mitchell
60711301c1
Initialise primary taxon in migration instead of in model callback
2014-06-03 11:29:54 +10:00
summerscope
31bab3469e
Implementing new X icon for modal window
2014-06-03 11:20:15 +10:00
summerscope
653120888f
Implementing new X icon for modal window
2014-06-03 11:20:03 +10:00
summerscope
c07ca67f29
Implementing new X icon for modal window
2014-06-03 11:19:56 +10:00
summerscope
73a68799be
Implementing new X icon for modal window
2014-06-03 11:19:45 +10:00
summerscope
d160f4fe51
Implementing new X icon for modal window
2014-06-03 11:19:37 +10:00
summerscope
cd332c1eb1
Implementing new X icon for modal window
2014-06-03 11:19:22 +10:00
summerscope
8a34160713
No change
2014-06-03 11:18:43 +10:00
summerscope
8fa053a0a8
Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly.
2014-06-03 10:28:18 +10:00
Rob H
bcfa1a8266
Fix spec to check validation of missing primary_taxon correctly
2014-05-30 20:06:40 +10:00
Rob H
f97ef0838c
Rollback variant_unit_change check, auto-set primary taxons where they exist
2014-05-30 19:20:15 +10:00
Rob H
bf4d83aecc
Fix master options_text display on front end
2014-05-30 18:39:41 +10:00
summerscope
8caccfc5b0
Merge laura_and_will into icon_font
2014-05-30 17:01:49 +10:00
summerscope
ef5b36cddd
Styling producers
2014-05-30 16:39:07 +10:00
Rob H
2a8ef182f2
Merge remote-tracking branch 'origin/master' into new-product-form
2014-05-30 16:38:50 +10:00
Rob H
1d5cc5dced
Adding specs for new product creation
2014-05-30 16:38:29 +10:00
summerscope
b19ca3b9c4
Remove whitespace
2014-05-30 16:38:27 +10:00
Rob H
66a47f053c
Amend products controller spec to include requirement for primary_taxon_id
2014-05-30 16:21:04 +10:00
summerscope
31ae0cf2a9
Tweak logic on contact us address line display
2014-05-30 16:14:40 +10:00
Will Marshall
5f163eef1c
Tweaking the contact thingy
2014-05-30 16:10:45 +10:00
summerscope
ae310ff606
Refactor producers tab content for spacing of string
2014-05-30 16:02:46 +10:00
summerscope
587cf1ac9b
Tabs styling for hub shopfront page
2014-05-30 15:56:40 +10:00
summerscope
06adca7462
Producers tab content styling and layout for hub shopfront page
2014-05-30 15:54:42 +10:00
summerscope
9f172af34c
Styling and layout for groups tab content
2014-05-30 15:54:42 +10:00
summerscope
87d58b639d
Styling and layout and content updates to contact hub tab content
2014-05-30 15:54:42 +10:00
summerscope
57b895b0c3
Styling and layout for About Hub Name tab content on shopping page
2014-05-30 15:54:41 +10:00
Will Marshall
5c46057bf3
Merge branch 'master' into laura_and_will
2014-05-30 15:53:03 +10:00
Will Marshall
13c6ce6786
Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty
2014-05-30 15:52:20 +10:00
Rob H
4aae6be9b7
Remove unused overrides for primary taxons and product/new
2014-05-30 15:48:36 +10:00
Rob H
66d6de9dfc
Merge master (with primary taxons restored)
2014-05-30 15:45:48 +10:00
Will Marshall
7abfb2f936
Showing the resizing logo as well
2014-05-30 15:32:47 +10:00
Rohan Mitchell
15d8299efb
Fix enterprises spec - primary taxons change
2014-05-30 15:28:53 +10:00
Will Marshall
de9319f002
Auto-aligning BEFORE resizing
2014-05-30 15:23:42 +10:00
Rob H
69376e7f4b
Merge in master
2014-05-30 15:10:13 +10:00
Will Marshall
3ddd7c31e8
Patching which image is rendered
2014-05-30 15:08:16 +10:00
Will Marshall
be640fd856
Patching a spec and naming something
2014-05-30 15:02:47 +10:00
Will Marshall
7304e24591
Switching the image dimensions
2014-05-30 14:47:53 +10:00
Will Marshall
a7340df6a5
Removing some dud test content
2014-05-30 14:45:27 +10:00
summerscope
5cbc60e686
Typo fix on food hub modal
2014-05-30 14:43:31 +10:00
summerscope
68582514ef
Grammar fix up for food hub modal
2014-05-30 14:41:34 +10:00
Will Marshall
a979334f2a
Adding primary taxon
2014-05-30 14:31:36 +10:00
Will Marshall
b736145552
Adding primary taxon to admin forms
...
Conflicts:
db/migrate/20140522044009_add_primary_taxon_to_products.rb
spec/features/admin/products_spec.rb
2014-05-30 14:31:27 +10:00
Will Marshall
1c31ac56ea
Adding primary taxon field to product
...
Conflicts:
db/migrate/20140522044009_add_primary_taxon_to_products.rb
2014-05-30 14:31:03 +10:00
summerscope
72c50486fa
ADding new icons into producer modal
2014-05-30 14:29:08 +10:00
summerscope
91224ed0a4
Merge issues. Removing position fixed on modal window styling.
2014-05-30 14:27:37 +10:00
Will Marshall
20873b6e45
Patching a minor regression spec
2014-05-30 14:21:21 +10:00
Will Marshall
18597a2377
Patching a minor regression spec
2014-05-30 14:18:51 +10:00
summerscope
5f6b8c9b5b
Merge branch 'laura_and_will' into icon_font
2014-05-30 13:19:54 +10:00
summerscope
5bdb38e293
Merge issues. Removing position fixed on modal window styling.
2014-05-30 13:19:47 +10:00
Will Marshall
85ee33517a
Restoring another deleted file
2014-05-30 13:19:23 +10:00
summerscope
42a9f16800
Adding in new icon into producer partial
2014-05-30 13:08:18 +10:00
summerscope
49a39bb240
Adding unlock icon to signed in
2014-05-30 13:06:48 +10:00
summerscope
179d9f609c
Adding in new lock icon to signed in
2014-05-30 13:05:56 +10:00
summerscope
2c334a0180
Styling for trash icon on checkout page
2014-05-30 13:02:34 +10:00
Will Marshall
2b0bdc69cd
Fixing a scope issue
2014-05-30 13:01:16 +10:00
Will Marshall
638d6d2ac0
Moving around the authentication specs
2014-05-30 12:58:58 +10:00
summerscope
00ac80bdbb
Add new icons
2014-05-30 12:56:56 +10:00
Will Marshall
368fbd2383
Patching up admin redirects to be MOAR UNIVERSAL
2014-05-30 12:52:14 +10:00
summerscope
a54b3f7849
Adding new icon for refresh
2014-05-30 12:39:44 +10:00
summerscope
9a962f7445
Add new icons to checkout & back to cart buttons
2014-05-30 12:35:54 +10:00
summerscope
5a7df20a2e
Update icon font for mixins
2014-05-30 12:32:46 +10:00
summerscope
589188d21e
Update icons for Tabs on hub shopping page
2014-05-30 12:32:28 +10:00
Will Marshall
206c947ea5
Tweaking test
2014-05-30 12:20:18 +10:00
summerscope
5c44413ae9
Merge branch 'laura_and_will' into icon_font
2014-05-30 12:18:29 +10:00
summerscope
10418b6035
Merge issues. Removing position fixed on modal window styling.
2014-05-30 12:17:44 +10:00
summerscope
15cde6c372
Merge branch 'laura_and_will' into icon_font
...
Conflicts:
app/views/groups/index.html.haml
app/views/modals/_producers.html.haml
2014-05-30 12:12:07 +10:00
summerscope
43cc77c88b
Adding icon into button
2014-05-30 12:01:57 +10:00
Will Marshall
ee785a3498
Merge branch 'master' into laura_and_will
2014-05-30 12:01:33 +10:00
Will Marshall
db131af5e7
Patching a class hook
2014-05-30 12:00:28 +10:00
Will Marshall
1a47a7486e
Automatically closing the accordion if the form is already valid
2014-05-30 11:58:22 +10:00
summerscope
3fca8640fd
Add class right to icons
2014-05-30 11:57:19 +10:00
summerscope
9cae581cda
Add class right to icons
2014-05-30 11:57:06 +10:00
summerscope
34c4fc8aa1
Add class right to icons
2014-05-30 11:56:52 +10:00
summerscope
474581211b
Add class right to icons
2014-05-30 11:56:41 +10:00
summerscope
e064aa3173
Restyling labels for new icons in checkout process
2014-05-30 11:49:32 +10:00
summerscope
cca6a39476
Adding in icons to checkout partial
2014-05-30 11:49:14 +10:00
summerscope
cbc28f6da7
Adding in icons to checkout partial
2014-05-30 11:48:59 +10:00
summerscope
b4f14197fa
Adding in icons to checkout partial
2014-05-30 11:48:47 +10:00
summerscope
4893679d12
Adding in icons to checkout partial
2014-05-30 11:48:32 +10:00
Rob H
d9f7865572
Can add an image from redesigned new product page
2014-05-30 11:31:53 +10:00
summerscope
a7a8c3ecee
Change icon for bullet point for list style
2014-05-30 11:30:52 +10:00
summerscope
0eb4e35ee4
New version of icon font
2014-05-30 11:30:30 +10:00
Rob H
c9acb14809
Adding primary taxon migration to schema
2014-05-30 11:30:00 +10:00
Will Marshall
dd0907addd
Adding back the primary taxon migration
2014-05-30 11:24:37 +10:00
Will Marshall
5b58bf2c71
Adding our own custom unauthorized page
2014-05-30 11:24:37 +10:00
Rohan Mitchell
4c6a7622eb
Convert rep template to rabl
2014-05-29 17:21:52 +10:00
Rohan Mitchell
7d73f7d7f2
Fix reversed checkbox value for select all variants on order cycle admin page
2014-05-29 17:21:52 +10:00
Will Marshall
3ae2dc34e8
Preventing rabl from dying if no current hub
2014-05-29 16:50:41 +10:00
Will Marshall
e26a61c31f
Adding back sanitize
2014-05-29 16:49:20 +10:00
summerscope
c0cb9857cc
Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.
2014-05-29 16:42:05 +10:00
Will Marshall
aaf9b76507
Making toggling of fat nodes work
2014-05-29 16:38:01 +10:00
Will Marshall
d5a652182e
Scrolling to groups when hotlinked
2014-05-29 16:31:12 +10:00
Will Marshall
c49d9d838c
Removing reference to modals and unnecessary ID
2014-05-29 16:19:20 +10:00
Will Marshall
f28fe34958
Removing groups modals
2014-05-29 16:15:39 +10:00
Will Marshall
e44853346e
Dropping current producers, switching to suppliers and using Angular
2014-05-29 16:12:58 +10:00
Will Marshall
06bac3de85
Fixing an incorrect sentence case
2014-05-29 15:45:56 +10:00
Will Marshall
65d11ce552
Removing some unnecessary
2014-05-29 15:41:27 +10:00
Will Marshall
2c1ca15393
Some tweaks to visual stuff
2014-05-29 15:37:19 +10:00
Rob H
9b10a2cb94
Added 'Add Another' link to new product page. Altered redirects
2014-05-29 12:13:55 +10:00
Rob H
e110677b3b
WIP: Rearrange new product form
2014-05-29 12:11:06 +10:00
summerscope
c81631118d
Add styling to include the search icon in big input searches for Hubs and Producers
2014-05-29 12:00:16 +10:00
summerscope
4f1c7345c5
Add search icon into search input on producers page
2014-05-29 11:59:55 +10:00
summerscope
86dee82acb
Add search icon into search input on hubs
2014-05-29 11:59:28 +10:00
Will Marshall
b757629bfa
Minor test tweaks
2014-05-29 11:52:46 +10:00
summerscope
39358247fd
Kill whitespace around icon
2014-05-29 11:47:06 +10:00
Will Marshall
74211cbfc7
Merge branch 'master' into fixing_modals
...
Conflicts:
app/assets/javascripts/darkswarm/all.js.coffee
app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
app/assets/javascripts/darkswarm/directives/modal.js.coffee
app/views/modals/_producer.html.haml
app/views/modals/_product.html.haml
app/views/shop/products.rabl
2014-05-29 11:14:16 +10:00
summerscope
68ab24b790
Add links into footer
2014-05-29 11:10:45 +10:00
summerscope
b8eb43f8db
Add groups icon to modal
2014-05-29 11:08:35 +10:00
summerscope
81f51e734c
Add groups icon to listings on page
2014-05-29 11:07:43 +10:00
summerscope
1248eaeed7
Add producers icon to modal
2014-05-29 11:05:28 +10:00
summerscope
ff1c5a13e7
Add producers icon to active table
2014-05-29 11:01:49 +10:00
summerscope
8f7bab4ab7
Add hub icon to active table
2014-05-29 10:54:27 +10:00
Rohan Mitchell
fdff442ec6
Do not fetch products JSON on every shopping page
2014-05-29 10:54:08 +10:00
summerscope
4971e2305f
Add hub icon to modal
2014-05-29 10:54:07 +10:00
summerscope
45f6a86fd2
Adding new icons to menu partials
2014-05-29 10:19:50 +10:00
Rohan Mitchell
2a630a855a
Move primary taxon field into Rob's new product form
2014-05-29 09:28:08 +10:00
summerscope
614b25c446
Applying new icon font to footer partial on homepage
2014-05-28 17:06:52 +10:00
summerscope
3f36a3785b
Adding in icon for list style from new OFN icon font
2014-05-28 17:06:34 +10:00
summerscope
6ea7988f4e
New version fonts
2014-05-28 17:06:06 +10:00
Rohan Mitchell
09ce8697af
Only trigger taxon search AJAX when column visible - fixes deadlocks in specs
2014-05-28 16:55:04 +10:00
summerscope
d3802e9f83
Applying new icon font to map partial on homepage
2014-05-28 16:43:06 +10:00
summerscope
4c832b6ae9
Applying new icon font to producers partial on homepage
2014-05-28 16:39:26 +10:00
summerscope
7185aa6ab6
Applying new icon font to groups partial on homepage
2014-05-28 16:38:01 +10:00
summerscope
8954caf3e0
Applying new icon font to active table on homepage
2014-05-28 16:33:01 +10:00
summerscope
0c2a7ac247
Adding style sheet to allow access to custom font
2014-05-28 16:32:37 +10:00
summerscope
1e0aec0267
Adding in font files for custom font
2014-05-28 16:32:10 +10:00
Will Marshall
4b1f409774
Only rendering images that exist{
2014-05-28 16:19:10 +10:00
Will Marshall
98b4fe27f6
Hiding group logo if not present
2014-05-28 16:12:13 +10:00
Will Marshall
fcfda13a73
Patching a couple of minor regressions
2014-05-28 16:10:28 +10:00
Will Marshall
5eb54d1ac3
Merge branch 'groups_page' into fixing_modals
2014-05-28 16:04:55 +10:00
Will Marshall
33829d9044
Only rendering images if they exist
2014-05-28 16:03:42 +10:00
Will Marshall
9bb059493e
Fixing the image render
2014-05-28 16:03:42 +10:00
Will Marshall
b8cc9d3343
Modding image sizing on groups
2014-05-28 16:03:42 +10:00
Will Marshall
f65ff5af18
Automatically sorting out image rotation
2014-05-28 16:03:42 +10:00
Will Marshall
a7105fc3a8
Tweaking image sizing on enterprise
2014-05-28 16:03:42 +10:00
Will Marshall
50c7bd55be
Adding url strip and re-construction of http
2014-05-28 15:06:01 +10:00
Will Marshall
0c8ee2488b
Moving back to ng-bind-html
2014-05-28 14:58:53 +10:00
Will Marshall
c26462db57
Addin some URL stripping
2014-05-28 14:45:26 +10:00
Will Marshall
576f10dbc3
Adding ng-if checks
...
Conflicts:
app/views/modals/_producer.html.haml
2014-05-28 14:44:17 +10:00
Will Marshall
1af82bd4fb
Forcing scope to parent scope so we don't child our child
...
Conflicts:
app/assets/javascripts/darkswarm/directives/modal.js.coffee
2014-05-28 14:43:16 +10:00
summerscope
1a79b966e9
Adding in links to homepage buttons for Groups & Producers
2014-05-28 12:21:25 +10:00
summerscope
3c3409bc1f
Tweaks to styling on groups page
2014-05-27 18:03:12 +10:00
summerscope
9fe4bef7df
Adding groups icon into background for visual consistency
2014-05-27 17:55:51 +10:00
summerscope
2130470eaf
Styling for groups page
2014-05-27 17:11:42 +10:00
Rohan Mitchell
cc2498bb9b
Fix spec fails - group buy and available on removed from new product form
2014-05-24 18:26:02 +10:00
Rohan Mitchell
403e957111
Further removal of references to 'Admin' from global namespace
2014-05-24 17:15:20 +10:00
Rohan Mitchell
e951f80070
Merge branch 'new-product-form'
...
Conflicts:
app/assets/javascripts/admin/admin.js.coffee
2014-05-24 17:14:32 +10:00
Rohan Mitchell
9c1528607a
Merge branch 'user-import-export'
2014-05-24 17:13:34 +10:00
Rohan Mitchell
acbe49b8de
Revert primary taxons
2014-05-24 17:13:01 +10:00
Rohan Mitchell
e6461ba01e
Fix enterprises spec - primary taxons change
2014-05-24 10:34:22 +10:00
Will Marshall
2db63540ee
Adding primary taxon
2014-05-24 10:27:57 +10:00
Will Marshall
0a8f5d91ba
Adding primary taxon to admin forms
2014-05-24 09:29:26 +10:00
Will Marshall
17f09d1852
Adding primary taxon field to product
2014-05-24 09:29:19 +10:00
Rohan Mitchell
e119192cf1
Manually revert merge commit "Hack patching the modals"
2014-05-24 09:23:12 +10:00
Rohan Mitchell
223caa046c
Revert "Producers modal styling and markup"
...
This reverts commit 4657285769 .
Conflicts:
app/assets/stylesheets/darkswarm/images.css.sass
app/views/modals/_producer.html.haml
2014-05-24 09:15:22 +10:00
Rohan Mitchell
69e0e71eb6
Revert "Styling for shop page product modal"
...
This reverts commit 84b6f99321 .
Conflicts:
app/assets/stylesheets/darkswarm/images.css.sass
app/views/modals/_producer.html.haml
2014-05-24 09:12:24 +10:00
Rohan Mitchell
bb1b7cfa90
Revert "Adding fields to product supplier"
...
This reverts commit 6d24a6555e .
2014-05-24 09:07:58 +10:00
Rohan Mitchell
ad1f852bdd
Revert "Adding primary taxon field to product"
...
This reverts commit fd1e7ebaa3 .
2014-05-24 09:07:57 +10:00
Rohan Mitchell
79393476b0
Revert "Adding primary taxon to admin forms"
...
This reverts commit 110a6f2d14 .
2014-05-24 09:07:56 +10:00
Rohan Mitchell
7ac33beb65
Revert "Adding primary taxon"
...
This reverts commit 58112fb105 .
2014-05-24 09:07:55 +10:00
Rohan Mitchell
a7566e3413
Revert "Always showing social media"
...
This reverts commit aa23b03f98 .
2014-05-24 09:07:52 +10:00
Rob H
4a9a1029a1
Fixed a typo
2014-05-23 22:33:59 +10:00
Rob H
14611896c0
Simplify new product form
2014-05-23 18:08:29 +10:00
Rohan Mitchell
d1028cb912
User import/export includes addresses
2014-05-23 17:51:19 +10:00
Rohan Mitchell
9aadc9d1ce
Add initial user import/export via CSV
2014-05-23 17:51:19 +10:00
Rohan Mitchell
2987ca763d
Add additional data sanitisation for foreign key migration
2014-05-23 17:51:19 +10:00
Will Marshall
aa23b03f98
Always showing social media
2014-05-23 17:29:18 +10:00
Will Marshall
fb7b9a051a
Hack patching the modals
2014-05-23 17:22:27 +10:00
Will Marshall
40f116783c
Merge branch 'new_shop'
...
Conflicts:
app/assets/stylesheets/darkswarm/images.css.sass
app/views/modals/_producer.html.haml
2014-05-23 16:02:20 +10:00
Will Marshall
58112fb105
Adding primary taxon
2014-05-23 16:01:24 +10:00
Will Marshall
110a6f2d14
Adding primary taxon to admin forms
2014-05-23 15:59:06 +10:00
Will Marshall
fd1e7ebaa3
Adding primary taxon field to product
2014-05-23 15:59:06 +10:00
Will Marshall
6d24a6555e
Adding fields to product supplier
2014-05-23 15:59:06 +10:00
summerscope
84b6f99321
Styling for shop page product modal
2014-05-23 15:59:06 +10:00
Rohan Mitchell
9e46108e9a
Enterprise user can only add order cycle exchanges where it manages the participant enterprise
2014-05-23 12:18:22 +10:00
Rohan Mitchell
14dee8d7fe
OrderCycleFormApplicator requires permitted_enterprises to be set explicitly
2014-05-23 12:09:38 +10:00
Rohan Mitchell
095b9bf67a
Enterprise user can only update order cycle exchanges where it manages the participant enterprise
2014-05-23 12:05:46 +10:00
Rohan Mitchell
9b15c213d1
When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges
2014-05-23 11:28:00 +10:00
Rob H
e85c144e87
Remove reference to 'Admin' from global namespace
2014-05-23 11:22:12 +10:00
summerscope
4657285769
Producers modal styling and markup
2014-05-22 16:35:48 +10:00
Rob H
47f6d32055
Make list items the same height
2014-05-22 15:47:50 +10:00
Rob H
f8776fecff
Move enterprises dashboard controller
2014-05-22 15:46:26 +10:00
Rob H
371240652c
Change 'Overview' menu item to 'Dashboard'
2014-05-22 15:30:11 +10:00
Rob H
ed3c23cd90
Split 'My Enterprises' dashboard item into Hubs and Producers
2014-05-22 15:28:25 +10:00
Will Marshall
1a7c6f87ed
Adding fields to product supplier
2014-05-22 14:47:27 +10:00
summerscope
d7bc1a9b95
Styling for shop page product modal
2014-05-22 14:40:35 +10:00
Will Marshall
015403c282
Merge branch 'new_shop'
2014-05-22 12:40:48 +10:00
Will Marshall
d1b27edefe
Reworking the JS specs
2014-05-22 12:40:46 +10:00
Will Marshall
272cb0469f
Setting up after_login redirects
2014-05-22 12:40:46 +10:00
Will Marshall
0140472fbc
Adding working modals
2014-05-22 12:40:46 +10:00
Will Marshall
d6512a78d4
Removing position fixed
2014-05-22 12:39:52 +10:00
Will Marshall
c69a4a5f1a
Adding social media links
2014-05-22 12:12:10 +10:00
Will Marshall
70f549e92a
Patching our modified admin login
2014-05-22 11:46:06 +10:00
Will Marshall
34c31afabe
Adding large image
2014-05-22 11:34:46 +10:00
Rohan Mitchell
a16f726377
Extract have_relationship test
2014-05-22 11:32:37 +10:00
Rohan Mitchell
c2f762d570
Enterprise user can only see relationships involving their enterprises
2014-05-22 11:27:19 +10:00
Rohan Mitchell
d7b4318aff
Find enterprise relationships involving any of a number of enterprises
2014-05-22 11:25:37 +10:00
Rohan Mitchell
06955a024f
Enterprise user can only create relationships with their own enterprises as parent
2014-05-22 11:02:03 +10:00
Rohan Mitchell
fb05ad57e1
Tidy up spec helper, clean database before suite run
2014-05-22 11:00:29 +10:00
Rohan Mitchell
66cd5c937f
Add a helper to make capybara specs fail fast
2014-05-22 10:59:41 +10:00
Rohan Mitchell
f6bc1a82be
Enterprise user can manage enterprise relationships
2014-05-22 10:54:51 +10:00
Will Marshall
12dfcd0de9
Fixing auth workflowsg
2014-05-22 10:43:26 +10:00
Will Marshall
250b76ec79
Merge branch 'master' into new_shop
2014-05-22 10:43:02 +10:00
Will Marshall
f997026796
Reworking the JS specs
2014-05-22 10:42:44 +10:00
Will Marshall
67e72f4504
Setting up after_login redirects
2014-05-22 10:42:44 +10:00
Will Marshall
2d0a42b2c2
Adding working modals
2014-05-22 10:42:44 +10:00
Rohan Mitchell
48a7b9c3f8
Fix specs from 'X permits Y' table format change
2014-05-22 08:50:52 +10:00
Rohan Mitchell
d8fa30ea6f
Add a sequence to option type position, prevents inconsistent ordering in specs
2014-05-21 16:54:26 +10:00
Rohan Mitchell
a049266732
Replace enterprise relationship parent/child concepts with 'X permits Y'
2014-05-21 16:28:27 +10:00
Rohan Mitchell
0c647841a6
Add dynamic filter to enterprise relationships
2014-05-21 16:18:07 +10:00
Rohan Mitchell
76d1754c32
Reorder helper method at bottom
2014-05-21 15:11:14 +10:00
Rohan Mitchell
92292c853d
Extract partials from enterprise relationships admin page
2014-05-21 15:03:29 +10:00
Rob H
3bf21d42dd
WIP: removing all payment methods from enterprise edit page
2014-05-21 15:02:59 +10:00
Rohan Mitchell
6026a74c73
Table matcher have_table_row does not wait for full duration on should_not
2014-05-21 14:59:24 +10:00
Rohan Mitchell
18886c931f
Extract create EnterpriseRelationship to service
2014-05-21 11:29:11 +10:00
Rohan Mitchell
5d0680234d
Admin can delete enterprise relationships
2014-05-21 11:29:11 +10:00
Rohan Mitchell
aa965e3752
Show a CSS3 animation when a row is added
2014-05-21 11:29:11 +10:00
Rohan Mitchell
f1df021091
Show enterprise relationships tab as selected
2014-05-21 11:29:11 +10:00
Rohan Mitchell
b9a9937541
Attempting to create a relationship with invalid data shows an error message
2014-05-21 11:29:11 +10:00
Rohan Mitchell
e40843bccb
Allow error messages without attribute name. Improve enterprise relationship error message.
2014-05-21 11:29:11 +10:00
Rohan Mitchell
9b2a80c6b5
Admin can create enterprise relationships
2014-05-21 11:29:11 +10:00
Rohan Mitchell
3cb55062cc
Split enterprise_relationships rabl into show and index
2014-05-21 11:29:11 +10:00
Rohan Mitchell
ba7e29074f
have_table_row waits
2014-05-21 11:29:11 +10:00
Rohan Mitchell
5f4e4ebeb0
Admin can list enterprise relationships
2014-05-21 11:29:11 +10:00
Rohan Mitchell
61af8204d9
Add spec matcher have_table_row
2014-05-21 11:29:11 +10:00
Rohan Mitchell
6414ae2972
Output enterprise relationships as JSON
2014-05-21 11:29:11 +10:00
Rohan Mitchell
1a854b89ec
Sort enterprise relationships by enterprise name
2014-05-21 11:29:11 +10:00
Rohan Mitchell
f7de504d89
Add stub angular controller for managing enterprise relationships
2014-05-21 11:29:11 +10:00
Rohan Mitchell
aa53d82386
Add stub page for managing enterprise relationships
2014-05-21 11:29:11 +10:00
Rohan Mitchell
4f1b8d06e7
Construct enterprise relationships with a factory
2014-05-21 11:29:11 +10:00
Will Marshall
391b1da04c
adding session token to order test
2014-05-21 10:46:03 +10:00
summerscope
d874855aa1
Update styling on empty cart
2014-05-20 16:40:23 +10:00
Will Marshall
c1a55de40e
Merge branch 'new_shop'
2014-05-20 16:09:31 +10:00
Will Marshall
ef91f8d17f
Redirecting if cart is empty and activating the empty cart link
2014-05-20 16:05:28 +10:00
Will Marshall
36aba8049f
Starting to rework login behaviour when hitting /admin
2014-05-20 16:05:28 +10:00
Will Marshall
da69167b4c
Putting error messages on checkout into error flash for easier debugging
2014-05-20 16:05:28 +10:00
Will Marshall
0b595e21d2
Showing admin for enterprise or admin user
2014-05-20 16:05:28 +10:00
summerscope
601281ced7
Add button style to shop page
2014-05-20 16:04:26 +10:00
summerscope
0957edee5d
Styling for shopping cart page
2014-05-20 15:50:03 +10:00
Will Marshall
03de82eb3c
Merge branch 'new_shop'
...
Conflicts:
app/controllers/checkout_controller.rb
2014-05-20 15:47:32 +10:00
Will Marshall
df82627bd1
Starting to rework login behaviour when hitting /admin
2014-05-20 15:47:00 +10:00
Will Marshall
2fc45d635d
Putting error messages on checkout into error flash for easier debugging
2014-05-20 15:16:52 +10:00
Will Marshall
4e463e7087
Showing admin for enterprise or admin user
2014-05-20 15:16:52 +10:00
summerscope
52345d9bb3
Improvements to shoptfront page styling
2014-05-20 14:11:41 +10:00
Will Marshall
3eb6f98c70
Putting error messages on checkout into error flash for easier debugging
2014-05-20 12:39:22 +10:00
Will Marshall
9557d69f71
Showing admin for enterprise or admin user
2014-05-20 12:33:29 +10:00
Will Marshall
685ba3f63a
Fixing my modal and the tests
2014-05-20 12:18:28 +10:00
Will Marshall
e7f6a9badf
Adding data to groups page
2014-05-20 12:18:28 +10:00
Will Marshall
61cf35a5b9
Adding attr_accessors and paperclip file uploads
2014-05-20 12:18:28 +10:00
Will Marshall
0958602418
Starting on migrations and admin forms
2014-05-20 12:18:27 +10:00
Will Marshall
4e4667c33d
Adding groups
2014-05-20 12:18:27 +10:00
summerscope
1dd9f6326b
Tweaking the markup and styling for shop page.
2014-05-16 15:59:53 +10:00
Rob H
2b414d99e1
Revert content_for changes
2014-05-16 15:12:47 +10:00
Will Marshall
eab9c28d2e
Adding groups to this branch, also tidying up the shop stuff for Laura
2014-05-16 14:00:33 +10:00
Rob H
03139cd2de
Use existing sidebar content_for
2014-05-16 11:42:40 +10:00
Rob H
6979644af7
Fiddle with colors and scrolling in admin enterpise sidebar
2014-05-16 11:28:02 +10:00
Will Marshall
3e22e55b61
Printing taxon icons on home
2014-05-16 10:23:32 +10:00
Will Marshall
7c213a061b
Getting working taxon sorting and icon rendering in
2014-05-16 10:23:32 +10:00
Will Marshall
91fe8e18d3
Taxon sorting
2014-05-16 10:23:32 +10:00
Will Marshall
3ac9c3e00d
Basics of producer modal in place
2014-05-16 10:23:32 +10:00
Will Marshall
adb134743f
Adding producer modals to home
2014-05-16 10:23:32 +10:00
Will Marshall
c9fea79d19
Printing the primary taxon name
2014-05-16 10:23:32 +10:00
Will Marshall
9f169e6ef8
Adding a basic stub of the primary taxon
2014-05-16 10:23:31 +10:00
Will Marshall
8c6e884563
Further improvements, fixing my directive, re-arranging partial
2014-05-16 10:23:31 +10:00
Will Marshall
12ddbb6a32
Reworking the shop page
2014-05-16 10:23:31 +10:00
Will Marshall
3ce196e042
Starting on the new shop
2014-05-16 10:23:31 +10:00
Will Marshall
924128098b
Restricting shipping methods
2014-05-16 10:20:32 +10:00
Rob H
dafa89a2cc
Add placeholder for ACN and ABN
2014-05-16 10:07:30 +10:00
Rob H
19aa79fc27
Add max height to admin sidebar items
2014-05-16 10:06:20 +10:00
Rob H
93dedb690d
Change overview controller to class_eval
2014-05-16 10:03:35 +10:00
Rob H
d17a316387
remove naughty pry
2014-05-15 22:43:08 +10:00
Rob H
fd6f4d04df
Merge branch 'master' into ent-makeover
2014-05-15 17:05:05 +10:00
Rob H
c1c92d62e4
Adjust admin enterprise edit to improve scanning
2014-05-15 17:03:47 +10:00
Will Marshall
da95df5ab3
patching one dud spec
2014-05-15 15:41:01 +10:00
Rob H
7cdfb4bab2
Add methods and fees to sidebar on enterprise edit page
2014-05-15 14:52:19 +10:00
Will Marshall
c0ba560fa6
Moving empties cart to a magic directive
2014-05-15 14:47:16 +10:00
Will Marshall
eae12da24a
Adding distributors display to producers page
2014-05-15 12:20:17 +10:00
Will Marshall
575ce9fe01
Adding producers to home and distributors to producers
2014-05-15 12:02:58 +10:00
Will Marshall
234d4de7ed
Forcing everything to be SSL
2014-05-14 15:55:19 +10:00
summerscope
ffd7f3c134
Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.
2014-05-14 15:55:19 +10:00
summerscope
dd89dad5b6
Add new font into buttons
2014-05-14 15:55:19 +10:00
summerscope
8238cbe0ee
Merge changes
2014-05-14 15:55:18 +10:00
summerscope
d462f34e75
Refactor friday - tidying up and commenting css
2014-05-14 15:55:18 +10:00
summerscope
9886166750
Add in script for google font Open Sans
2014-05-14 15:55:18 +10:00
Rohan Mitchell
a2205d3f93
Make order cycles spec consistent
2014-05-14 15:50:25 +10:00
Rohan Mitchell
6c5172c567
Add EnterpriseRelationship. An Enterprise can find its relatives.
2014-05-14 15:50:25 +10:00
Will Marshall
5f712a8984
Removing code
2014-05-14 15:16:29 +10:00
Will Marshall
151702d685
Catching order cycle expiry and redirecting
2014-05-14 11:51:25 +10:00
Rob H
31334be615
Tidy up of new dashboard, add 'CREATE NEW' button at top right
2014-05-14 11:31:42 +10:00
Will Marshall
1c98f10c20
Adding indexing by user id
2014-05-14 11:08:21 +10:00
Will Marshall
a3b5ba2257
Adding a spec for visiblity filtering
2014-05-13 16:38:52 +10:00
Will Marshall
f574d8a65b
Restricting to visible
2014-05-13 16:34:20 +10:00
Rob H
c98d2e71d8
Add scroll pane to admin dashboard
2014-05-09 17:20:53 +10:00
Will Marshall
afffa6fc39
Merge branch 'master' into checkout
2014-05-09 16:45:58 +10:00
Will Marshall
5b2e9e9c30
Final set of regression issues
2014-05-09 16:43:57 +10:00
Will Marshall
573d479e08
Fixing test regressions
2014-05-09 16:43:57 +10:00
Will Marshall
631bef223c
Refactoring checkout test
2014-05-09 16:42:51 +10:00
Will Marshall
f25617dde7
Tweaks for laura, reworking authentication workflow, tidying up checkout
2014-05-09 16:42:51 +10:00
Rohan Mitchell
5a0cc1b6db
Increase capybara default_wait_time to 30 s, now we know it's not the primary cause of spec slowdown
2014-05-09 16:39:39 +10:00
Rohan Mitchell
d96274ddbe
Turn off enforce_available_locales, working around performance regression https://github.com/svenfuchs/i18n/issues/230
2014-05-09 16:39:39 +10:00
Rohan Mitchell
04379101e1
Change to new production hostname: openfoodnetwork.org.au
2014-05-09 16:39:39 +10:00
summerscope
7bf969ca1b
Removing empty containers and adding classes for padding required
2014-05-09 16:27:28 +10:00
Rob H
05e01d02c4
Merge branch 'master' into ent-makeover
2014-05-09 15:58:17 +10:00
Rob H
5b54f220a0
Fix failing BOM ng-spec
2014-05-09 15:56:29 +10:00
Rob H
a0d54a4318
Fix failing BOM ng-spec
2014-05-09 15:51:22 +10:00
Rob H
01c5822fcc
Add basic dashboard to admin section
2014-05-09 15:48:58 +10:00
summerscope
76d3fa902f
Rejigging footer columns for responsive styling
2014-05-09 15:46:35 +10:00
summerscope
461d30e006
Tweak stylign to show large menu visibility class for large + up
2014-05-09 15:39:09 +10:00
Rohan Mitchell
b801480024
Increase capybara default_wait_time to 30 s, now we know it's not the primary cause of spec slowdown
2014-05-09 15:09:00 +10:00
summerscope
a3e12ae1f3
Tweak label and order of fields
2014-05-09 15:05:51 +10:00
summerscope
7e96181f07
Add style classification to distinguish between pane and full page for #id
2014-05-09 14:54:47 +10:00
Rohan Mitchell
8bf9921eef
Turn off enforce_available_locales, working around performance regression https://github.com/svenfuchs/i18n/issues/230
2014-05-09 14:39:12 +10:00
summerscope
3d2d6fa33c
Styling for checkout page and the hubs heading above shopping section
2014-05-09 14:34:42 +10:00
summerscope
e8a5a4984b
Styling work on the checkout page WIP
2014-05-09 14:34:42 +10:00
summerscope
961a32816c
Remove variables sass - double up of branding
2014-05-09 14:34:42 +10:00
summerscope
eff4c5f309
Make small size generic not specific to footer
2014-05-09 14:34:42 +10:00
summerscope
f89667ffe4
Refactor content in footer, add in link for creative commons, only thing missing is T&Cs!
2014-05-09 14:34:41 +10:00
Will Marshall
9903e42811
Adding reset password stuff
2014-05-09 14:26:07 +10:00
Will Marshall
1297520051
Authentication steps test
2014-05-09 14:13:39 +10:00
Will Marshall
9241178fe2
Making modal medium man
2014-05-09 12:23:34 +10:00
Will Marshall
c52457505e
Fixing issues with offcanvas
2014-05-09 12:18:05 +10:00
Will Marshall
860dcf8e11
Adding dirty class
2014-05-09 11:35:27 +10:00
Rohan Mitchell
87179669a6
Change to new production hostname: openfoodnetwork.org.au
2014-05-09 11:34:52 +10:00
Will Marshall
8595359d4d
Fixing a missing reference to Navigation
2014-05-09 11:03:03 +10:00
Will Marshall
e0e279e849
Merge branch 'master' into checkout
2014-05-09 10:36:41 +10:00
Will Marshall
0df2eabf95
Moving useless assets
2014-05-09 10:32:39 +10:00
Will Marshall
1e6783148d
Merging
2014-05-09 10:16:26 +10:00
Will Marshall
d9f462ba81
Moving useless assets
2014-05-09 10:12:40 +10:00
Will Marshall
05f5e5562f
Adding menu helper, removing admin path
2014-05-09 10:05:09 +10:00
Will Marshall
3b1fcca39b
Splitting out the accordion stuff for checkout
2014-05-09 09:56:54 +10:00
Will Marshall
6696b8e17b
Patching a conflict with Foundation JS
2014-05-09 09:56:54 +10:00
Rohan Mitchell
4ebc22f438
Remove capybara-screenshot, which appears to have been slowing down the build dramatically
2014-05-09 08:56:10 +10:00
Rohan Mitchell
87b605b604
Remove specific default_wait_time setting in BOM - this value is globally increased in spec_helper
2014-05-09 08:55:44 +10:00
Rohan Mitchell
34c18b522c
Fix incorrect admin path
2014-05-09 08:33:26 +10:00
Rohan Mitchell
967d4c81ab
Cache expensive options_text call
2014-05-08 20:55:43 +10:00
summerscope
d227fb24fe
Styling checkout page
2014-05-08 17:36:17 +10:00
Will Marshall
aff33a1f61
Disabling autoscroll
2014-05-08 17:10:29 +10:00
Will Marshall
f5ca01d344
Removing the generic handling on hashes
2014-05-08 17:10:29 +10:00
Will Marshall
ab64de5838
And patching bugs in nav
2014-05-08 17:10:29 +10:00
Will Marshall
d07ecb742b
Fixing bug on producers page
2014-05-08 17:10:29 +10:00
summerscope
3a04ccb52c
Menu styling for mobile menu
2014-05-08 17:10:29 +10:00
summerscope
07e53b8292
Make padding top responsive depending on big or mobile menu top-bar
2014-05-08 17:10:29 +10:00
summerscope
07f1bba822
Restyling active nodes for producer and hub
2014-05-08 17:10:28 +10:00
summerscope
c66aaad62e
Styling for producers page and content in active table
2014-05-08 17:10:28 +10:00
summerscope
64c94793e4
Menu styling for mobile menu
2014-05-08 16:41:18 +10:00
Will Marshall
5fa0d845a4
Reworking the checkout
2014-05-08 16:38:21 +10:00
Will Marshall
998fb07330
Splitting out the accordion stuff for checkout
2014-05-08 16:07:56 +10:00
summerscope
f2be0746bf
Make padding top responsive depending on big or mobile menu top-bar
2014-05-08 16:01:34 +10:00
summerscope
daaa2760a0
Restyling active nodes for producer and hub
2014-05-08 15:55:36 +10:00
summerscope
e7a3b48274
Styling for producers page and content in active table
2014-05-08 15:34:43 +10:00
Will Marshall
457c9be0f3
Patching a conflict with Foundation JS
2014-05-08 15:14:09 +10:00
Will Marshall
4e2326eaa2
Making the offcanvas not position fixed
2014-05-08 13:19:44 +10:00
Will Marshall
50f5a1c46f
Hash toggling
2014-05-08 13:19:44 +10:00
summerscope
967f2827bf
Make label consistent for Log in
2014-05-08 12:57:04 +10:00
summerscope
df87c9d715
Adding in github link to footer
2014-05-08 12:55:02 +10:00
summerscope
e41de9be36
Styling up login modal
2014-05-08 12:51:09 +10:00
Will Marshall
6a2c68701e
Adding small class
2014-05-08 12:50:42 +10:00
Will Marshall
de369d938f
Starting to work on anchor scrolling
2014-05-08 12:34:16 +10:00
Will Marshall
2563576f86
Adding a class to the login modal
2014-05-08 12:26:37 +10:00
Will Marshall
09f239ddfe
Merging
2014-05-08 12:20:26 +10:00
Will Marshall
ff20837f50
Fixing a path issue
2014-05-08 11:50:57 +10:00
Will Marshall
d5648bd993
Removing some garbage, adding admin link
2014-05-08 11:50:57 +10:00
summerscope
a7ef1295e4
Tweak styles to adjust break point for menu
2014-05-08 11:48:12 +10:00
Will Marshall
eb5dbd0654
Fixing a regression
2014-05-08 11:18:53 +10:00
summerscope
c5376f3862
Reset to head
2014-05-08 11:08:47 +10:00
Rob H
169d5669f1
Amend specs
2014-05-07 13:34:47 +10:00
Rob H
dcf048d631
Merge branch 'temp' into ng-cleanup
2014-05-07 13:08:13 +10:00
Rob H
fe5d015778
Merging in master
2014-05-07 13:07:11 +10:00
Rob H
2e7cf612d6
Fix broken BOM spec
2014-05-07 12:30:06 +10:00
Rob H
d7b232aefd
Split dirtyProducts out into its own service
2014-05-07 11:25:09 +10:00
Rohan Mitchell
607045f858
Fix inconsistent spec fail - sorting
2014-05-07 09:27:08 +10:00
Will Marshall
1823dac694
Patching to trigger
2014-05-06 18:35:04 +10:00
Will Marshall
6af314a075
Patching unmerged path
2014-05-06 18:31:20 +10:00
Will Marshall
549b41d6fe
Patching a spec issue with occlusion
2014-05-06 18:28:55 +10:00
Will Marshall
7835343273
Switching out colour schemes
2014-05-06 18:28:55 +10:00
Will Marshall
1756479c85
Patching a regression bug with login on checkout
2014-05-06 18:28:20 +10:00
Will Marshall
3542799349
Removing pointless foundation crud, reworking the login
2014-05-06 18:28:20 +10:00
summerscope
1c926c49bc
Styling for producer node + add link for producers into footer
2014-05-06 18:27:17 +10:00
summerscope
e84ee91184
Styling for producers page and new pretty bg picture
2014-05-06 18:24:30 +10:00
summerscope
1d9a1aa8ce
Add stylesheet for producers
2014-05-06 18:04:17 +10:00
summerscope
779bf6b096
Renaming ID to make it more generic to table search rather than Hub
2014-05-06 17:55:38 +10:00
summerscope
c4cd15423c
Add email link with reverse
2014-05-06 17:40:02 +10:00
summerscope
6cb186ffe3
Styling for footer and further work for top nav
2014-05-06 17:32:22 +10:00
summerscope
93f095d976
Adding a menu style and styling around the new top nav
2014-05-06 16:10:02 +10:00
Will Marshall
1a396429fe
Re-ordering stuff for Laura
2014-05-06 12:27:21 +10:00
Will Marshall
5b962cc3e4
Merge branch 'darkswarm_home'
2014-05-06 11:41:37 +10:00
Will Marshall
25de2f920a
Merge branch 'master' into reworking_menu
...
Conflicts:
app/views/layouts/darkswarm.html.haml
2014-05-06 11:16:20 +10:00
Will Marshall
010025798d
Removing a redundant 'in'
2014-05-05 16:29:33 +10:00
Will Marshall
9db602f031
Patching the visible flag in admin
2014-05-05 16:26:03 +10:00
Will Marshall
dcd2e39f2c
Tweaking for a moved partial
2014-05-05 15:57:16 +10:00
Will Marshall
dd25bfd345
Starting to rework menu
2014-05-05 15:52:48 +10:00
Will Marshall
1774bc1e19
Adding producers filtering and more Angular magic
2014-05-05 15:43:11 +10:00
Will Marshall
27728d6f0e
Adding our first request spec
2014-05-05 12:10:14 +10:00
Rob H
6ba0d6c5f9
WIP: Split out admin angularjs
2014-05-02 21:38:39 +10:00
Will Marshall
1e7e1a3127
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork
...
Conflicts:
spec/features/consumer/shopping/checkout_spec.rb
2014-05-02 16:12:41 +10:00
Rob H
5a2a43a060
Create angularjs admin module
2014-05-02 15:56:20 +10:00
Rohan Mitchell
901c9abe38
Increase wait time for failing spec
2014-05-02 15:39:17 +10:00
Will Marshall
bbb70342b3
Merging
2014-05-02 15:35:43 +10:00
Will Marshall
23fa1c7b7b
Patching a couple more issues
2014-05-02 15:17:44 +10:00
Will Marshall
b907616749
Renaming our partials
2014-05-02 14:47:12 +10:00
Rob H
ceada3596b
Merge master into cleanup
2014-05-02 14:43:06 +10:00
Rohan Mitchell
db653682b1
Add capybara-screenshot - automatic screenshots for test fails
2014-05-02 14:25:32 +10:00
Rohan Mitchell
1d5f0042d4
Remove sleeps - these should be covered by increased capybara wait time now
2014-05-02 14:25:32 +10:00
Rohan Mitchell
930bc2b7ce
Set increased Capybara.default_wait_time globally
2014-05-02 14:25:32 +10:00
Rohan Mitchell
4480c75494
Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway
2014-05-02 14:25:32 +10:00
Rohan Mitchell
c9aefa507a
Remove chili
2014-05-02 14:25:32 +10:00
Rohan Mitchell
d707624525
Fix warnings - faker clash with ffaker, i18n enforce_available_locales
2014-05-02 14:25:32 +10:00
Will Marshall
9fb4b2f9d8
Ctrl-C now cancels karma
2014-05-02 14:19:52 +10:00
Will Marshall
dfd1dd609d
Re-engaging checkout spec
2014-05-02 14:13:00 +10:00
Will Marshall
d74265e44d
Ctrl-C now cancels karma
2014-05-02 14:04:43 +10:00
Will Marshall
3d06caf1e3
Merging in master
2014-05-02 13:10:31 +10:00
Will Marshall
123bd7963d
Adding tests for hub filter
2014-05-02 13:07:46 +10:00
Will Marshall
19137ce309
Adding state to home page filtering
2014-05-02 12:57:33 +10:00
Will Marshall
9bd76df116
That wasn't actually a bug! Sorry
2014-05-02 12:52:51 +10:00
Will Marshall
794d7b69ae
Restoring our toggle option
2014-05-02 12:50:32 +10:00
Will Marshall
705e247eb8
Tweaking the bulk order management spec again
2014-05-02 12:41:04 +10:00
Will Marshall
8c319334db
Cleaning out the spree auth stuff
2014-05-02 12:34:19 +10:00
Rob H
de369ae32b
WIP: Can manage taxons in BPE
2014-05-02 10:28:33 +10:00
Will Marshall
34f170d4f7
Bugged thing in the shop spec
2014-05-02 10:18:57 +10:00
Will Marshall
b755733812
Removing chili spec
2014-05-01 17:47:16 +10:00
Will Marshall
c5e6b24779
Removing specs that accidentally got in here
2014-05-01 17:46:00 +10:00
Will Marshall
1703f7503b
Removing dead weight
2014-05-01 17:43:02 +10:00
Will Marshall
2d536e01e7
Patching some deadlocks
2014-05-01 17:21:46 +10:00
Will Marshall
59d2bc908e
Adding quick login, more test refactoring
2014-05-01 17:11:56 +10:00
Will Marshall
0956aa2532
Patching a bug in order cycle partial
2014-05-01 17:08:15 +10:00
Will Marshall
6ad30d901d
Tidying down shop/checkout test
2014-05-01 16:22:11 +10:00
Will Marshall
e65924c50f
Removing a dud reference to active'
2014-05-01 15:52:27 +10:00
Will Marshall
2ff2d3dcbd
Starting to work on test format
2014-05-01 15:51:40 +10:00
Rob H
56204d4ea6
Upgrade Admin AngularJS
2014-05-01 13:01:52 +10:00
summerscope
c1ab0c0f0b
Renaming sass files for relevance. Style tweaks for large input to fix firefox bug.
2014-04-30 16:12:39 +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
summerscope
4ed81da022
Updates to styling homepage and active table
2014-04-30 15:36:42 +10:00
summerscope
dcacf01c1d
Tweaking copy for food hubs modals.
2014-04-30 15:05:41 +10:00
Will Marshall
e901f3439a
Starting to partialize and test the RABL partials
2014-04-30 13:52:06 +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
f68a637609
Renaming Enterprise.active to Enterprise.visible
2014-04-30 12:09:22 +10:00
Will Marshall
4ca148ee93
Starting on the producers controller
2014-04-30 12:05:53 +10:00
Will Marshall
563976c084
Adding an active scope and test to Enterprise
2014-04-30 12:02:11 +10:00
Will Marshall
137c265885
Merge branch 'darkswarm'
2014-04-30 11:44:30 +10:00
Will Marshall
b6ffb863ce
Adding mailto directive
2014-04-30 11:41:53 +10:00
Will Marshall
149d0fc9b5
Merging in master and adding footer email changeS
2014-04-30 11:18:38 +10:00
Will Marshall
1ef317c17b
Adding reversed email address to footer
2014-04-30 11:12:29 +10:00
Will Marshall
22aaa24962
Disabling scroll increment/decrement on Number inputs
2014-04-30 10:57:30 +10:00
Will Marshall
e08f0a5feb
Removing a feature spec BECAUSE we've got the same tests in the controller spec baby
2014-04-30 10:06:46 +10:00
Will Marshall
06c10515dc
Patching a bug
2014-04-29 16:40:23 +10:00
summerscope
df73e8f63c
new SVGs
2014-04-29 16:39:45 +10:00
summerscope
31f7d51c2f
More homepage styling, updated svgs, remove unused images, more styling and markup
2014-04-29 16:38:25 +10:00
Will Marshall
6f0d6cda3d
Adding back Rspec profiling
2014-04-29 16:20:30 +10:00
Will Marshall
3e1dce4d18
Removing an archived spec
2014-04-29 16:19:21 +10:00
summerscope
9d0d7f85f6
Styling footer and beta sections.
2014-04-29 15:51:05 +10:00
Will Marshall
a3252283af
Re-engaging the authentication specs for checkout
2014-04-29 15:29:37 +10:00
Will Marshall
ef6fe2b181
Refactoring all interactions with the home/hub table into UIHelper
2014-04-29 15:22:04 +10:00
Will Marshall
d7f8d2f5c7
Reworking some broken tests
2014-04-29 15:13:59 +10:00
Will Marshall
26adada506
Reworking UI tests
2014-04-29 15:13:59 +10:00
Will Marshall
9415c4e3ab
Patching our integration tests to use the new home page mechanics
2014-04-29 15:13:58 +10:00
summerscope
5e6ac747b3
More styling for active table. tweak naming conventions to make appropriate - more generic for active_table, more specific for home_panes.
2014-04-29 14:24:18 +10:00
summerscope
f13ca0a40d
More homepage styling for panes
2014-04-29 13:35:44 +10:00
summerscope
1de5efb172
Changing color naming convention and updating all stylesheets
2014-04-29 12:37:49 +10:00
summerscope
c615a805f3
More styling for active table so nodes which are inactive have different interactive states
2014-04-29 11:45:08 +10:00
summerscope
fa68f49898
Slicing pictures for web production
2014-04-29 10:38:08 +10:00
Will Marshall
c33fa03736
Merging into master
2014-04-29 10:35:05 +10:00
Will Marshall
c60836af64
Adding modernizr to
2014-04-29 10:08:12 +10:00
Rohan Mitchell
126ddd0a75
Add explicit wait before inconsistently failing lookup
2014-04-25 18:59:33 +10:00
Rohan Mitchell
c8f50216ab
Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI
2014-04-25 18:06:09 +10:00
summerscope
c9f75f2933
Homepage pretty background image and active table styling
2014-04-25 17:19:48 +10:00
Rohan Mitchell
ad6021a116
Revert "In specs, correctly disable referential integrity for postgres"
...
This reverts commit 1610e1448a .
2014-04-25 17:14:25 +10:00
Will Marshall
9117b1f516
Adding some notes for future refactoring and a couple of pending integration tests for the new home
2014-04-25 17:14:18 +10:00
Will Marshall
28230f0436
Adding a current user service, refactoring various consequences of this change:
2014-04-25 16:59:46 +10:00
Rohan Mitchell
1610e1448a
In specs, correctly disable referential integrity for postgres
2014-04-25 16:58:25 +10:00
Will Marshall
8f539aca1f
Removing some console logs
2014-04-25 16:20:01 +10:00
Rohan Mitchell
c35112a40c
Migration works without countries or states (ie. in CI)
2014-04-25 16:18:30 +10:00
Will Marshall
22b87cc236
Adding active flag to enterprises
2014-04-25 16:17:37 +10:00
Rohan Mitchell
91d9b546d2
Merge branch 'foreign-keys'
2014-04-25 16:06:54 +10:00
summerscope
5505f3aa06
More styling for panels and buttons
2014-04-25 15:56:17 +10:00
Will Marshall
b0ecadcb28
Moving our sidebar to a service for maximum awesomesauce
2014-04-25 13:49:44 +10:00
Will Marshall
57a65f815e
Downcasing it all baby
2014-04-25 13:01:02 +10:00
Will Marshall
b413acfa2e
Printing out the taxons baby
2014-04-25 12:57:08 +10:00
summerscope
776a8db7ae
Adding new panes
2014-04-25 12:48:13 +10:00
summerscope
980efd5793
Adding new panes and making it pretty
2014-04-25 12:48:13 +10:00
Will Marshall
cf67b5fcac
Adding a taxon collection mechanism to Enterprise
2014-04-25 12:45:03 +10:00
Will Marshall
dbf15c03d3
Refactoring how we change window.location
2014-04-25 12:13:50 +10:00
Will Marshall
b7f28c8d82
Popup dialog when changing hub:
2014-04-25 12:11:09 +10:00
Will Marshall
22dc8cbfa0
Unbreaking karma karma lama
2014-04-25 12:04:15 +10:00
summerscope
c91e3aaa79
Removing useless hubs requirement in Hub service
2014-04-25 11:41:41 +10:00
summerscope
386908a947
Adding in copy for modals
2014-04-25 11:32:25 +10:00
Will Marshall
2212156f00
Adding handling of 'current hub'
2014-04-25 11:32:02 +10:00
Will Marshall
f57020d190
Fixing a bug with modals
2014-04-25 11:09:27 +10:00
summerscope
4b87e39fd7
Adding in content for modals
2014-04-24 17:13:53 +10:00
Will Marshall
9ef7023600
Adding template cache injection
2014-04-24 17:05:10 +10:00
Will Marshall
962a9cb5f7
Moving partials from darkswarm to hubs
2014-04-24 16:53:46 +10:00
Will Marshall
f9b7b602da
Moving from darkswarm to home
2014-04-24 16:53:00 +10:00
Will Marshall
f6bfc71c4b
Various small functional tweaks
2014-04-24 16:28:12 +10:00
Rob H
07ace99adc
Add informational warnings to admin enterprises index page
2014-04-24 16:10:40 +10:00
Rob H
566704a968
Alter enterprise index order
2014-04-24 16:09:52 +10:00
Rohan Mitchell
85db8859bb
On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage
2014-04-24 15:51:39 +10:00
Rob H
29cf40a5bf
Add visual indication that no payment/shipping/fees exist to enterprise index
2014-04-24 15:35:59 +10:00
Rob H
43106d5db8
Add explanation to top of BOM
2014-04-24 15:10:45 +10:00
Rohan Mitchell
2603256a17
Extract admin order cycle index row into partial
2014-04-24 14:53:32 +10:00
Rohan Mitchell
d0585b4d05
Admin order cycle listing does not show order cycles that enterprise users don't have access to
2014-04-24 14:43:33 +10:00
summerscope
4b95b9979e
Homepage styling and pretties
2014-04-24 14:12:27 +10:00
Rob H
c86586fc16
Remove collection date from admin enterprises index
2014-04-24 13:57:56 +10:00
summerscope
47468127c2
New pictures added
2014-04-24 13:56:30 +10:00
summerscope
7b794324d3
Adding pretty pictures
2014-04-24 13:53:08 +10:00
Rob H
b59aa53158
Add edit order button to BOM
2014-04-24 13:49:28 +10:00
Rohan Mitchell
8dd9260163
Do not add dummy distributor to orders without one - they don't need it
2014-04-24 13:20:16 +10:00
Rohan Mitchell
b649d6ef69
Authorise access to OrderCycles API
2014-04-24 13:20:16 +10:00
Rohan Mitchell
3c8757034a
Enterprise user can soft-delete a variant. BUT, only its own variants.
2014-04-24 13:20:16 +10:00
Rohan Mitchell
8715b71151
Do not show rspec profiling by default
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
95a6e34523
Spec access denied to regular user when soft-deleting variants
2014-04-24 13:20:16 +10:00
Rohan Mitchell
d16d970952
BPE uses soft-delete
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
Rohan Mitchell
4cbe434573
Remove trailing relations on destruction for EnterpriseFee and Variant
2014-04-24 13:20:15 +10:00
Rohan Mitchell
f7658ad250
Add foreign keys, sanitising data first
2014-04-24 13:20:15 +10:00
Rob H
2e51518b5b
CMS spec being weird
2014-04-24 11:28:53 +10:00
Will Marshall
5ea97b0919
Merge branch 'darkswarm_home' of github.com:openfoodfoundation/openfoodnetwork into darkswarm_home
2014-04-24 11:06:46 +10:00
Will Marshall
9bb0abbe48
Merge branch 'master' into darkswarm_home
2014-04-24 10:52:33 +10:00
Rob H
76f05d13d7
Slow specs on CI
2014-04-24 10:50:35 +10:00
summerscope
7c11a4082f
Styling tagline
2014-04-24 10:46:55 +10:00
Will Marshall
3ed569b24a
Patching a couple of borked specs
2014-04-24 09:52:29 +10:00
Will Marshall
b4da348e36
Patching a json test
2014-04-23 16:58:38 +10:00
Will Marshall
c060019873
Adding a learn more modal, restructuring partials
2014-04-23 16:48:53 +10:00
Will Marshall
0479a0a55d
Fixing bugs, improving dates
2014-04-23 15:46:14 +10:00
Will Marshall
16251fe5ea
Merging with master
2014-04-23 14:43:39 +10:00
Will Marshall
2981412540
Adding some specs, next order cycle, better CSS
2014-04-23 14:38:41 +10:00
Will Marshall
8027af2bb7
Adding active boolean and sorting
2014-04-23 13:22:30 +10:00
Will Marshall
f5b32ebd3f
Better handling of the home page hubs
2014-04-23 12:58:34 +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
669ec0eee7
Fix failing API specs
2014-04-23 12:02:27 +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
c5f8e2e123
Better temp text
2014-04-23 11:49:27 +10:00
Will Marshall
8e67be6e4f
More minor presentation changes
2014-04-22 17:19:13 +10:00
Will Marshall
078a23a152
More prettification
2014-04-22 17:08:40 +10:00
Will Marshall
baa2065238
Tweaking filter to be case insensitive
2014-04-22 16:10:13 +10:00
Will Marshall
8b7d2641f9
Starting to prettify with Laura
2014-04-22 15:46:14 +10:00
Will Marshall
fb072ad1a5
Tweaking debounce, adding it to Shop
2014-04-18 16:56:14 +10:00
Will Marshall
35a792b3ca
Debouncing things
2014-04-18 16:53:43 +10:00
Will Marshall
99d743f7cf
Some very basic specs
2014-04-18 16:35:06 +10:00
Will Marshall
240b600bfa
Adding a No Results case
2014-04-18 16:15:21 +10:00
Will Marshall
f3e30d10ba
Starting some bones for Laura
2014-04-18 16:10:19 +10:00
Will Marshall
66d5f08b99
Adding custom filtering to home page
2014-04-18 15:17:12 +10:00
Will Marshall
5778a51bf6
Switching to placeholders and so on
2014-04-18 13:08:45 +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
c0228e0cc3
Patching the admin JS
2014-04-18 11:37:19 +10:00
Will Marshall
a5a3f9fe43
Fixing up some minor spec bugs
2014-04-17 17:22:30 +10:00
Will Marshall
e2d3207a51
Namespacing accordion state by ID
2014-04-17 15:34:57 +10:00
Rob H
2532248e6f
Fix failing javascript tests
2014-04-17 15:27:15 +10:00
Rob H
78fad1cc85
Make more orders load for BOM
2014-04-17 15:19:48 +10:00
Will Marshall
202b45fc5f
Aligning text left in Order Summary
2014-04-17 15:15:14 +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
Will Marshall
3b440ed027
Minor JS tweaks
2014-04-17 11:47:59 +10:00
Will Marshall
f2a048bf6e
Adding another autofocus
2014-04-17 10:50:49 +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
Rob H
2eb21a024c
Tiny fixes to API orders controller spec
2014-04-16 18:24:17 +10:00
Will Marshall
a7c2849e6b
Moving icons around, adding a useful comment
2014-04-16 16:24:03 +10:00
Will Marshall
171c8c6ed1
Merging in with master
2014-04-16 16:16:15 +10:00
Will Marshall
20e1392736
Focusing appropriate fields as we move through the form
2014-04-16 16:13:04 +10:00
Will Marshall
d83367486b
Adding icons to checkout, focusing on first input in each panel when selected
2014-04-16 16:07:19 +10:00
Rob H
c68aeb4c36
Only show orders I am distributing in the API
2014-04-16 14:54:50 +10:00
Will Marshall
2b9b51de60
Don't cache things in window
2014-04-16 11:55:16 +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
6452ebf67d
Make spec more robust
2014-04-11 19:08:55 +10:00
Rohan Mitchell
aa1c28b163
Move enterprises api controller out of spree namespace
2014-04-11 19:08:55 +10:00
Rohan Mitchell
8ad7cac639
Do not need to protect here, since we're clearing all unit option values earlier in this method
2014-04-11 19:08:55 +10:00
Rohan Mitchell
47ac097eb7
Do not show deleted variants on shopfront
2014-04-11 19:08:55 +10:00
Will Marshall
19b8cee38e
Patching up some more bugs, adding workflow
2014-04-11 17:58:32 +10:00
Will Marshall
2d9be9ea06
Fixing the scope issue
2014-04-11 17:49:51 +10:00
Will Marshall
9cb56c61ae
Patching a bug in which carts get emptied
2014-04-11 17:32:39 +10:00
Will Marshall
2e0485c064
Getting the entire order into localStorage: one bug with radio boxes
2014-04-11 17:24:32 +10:00
Will Marshall
c8012e7045
Improving panel workflow, moving back to simple format for Order service
2014-04-11 16:43:21 +10:00
Will Marshall
5268938d49
Focusing on the first form field
2014-04-11 13:41:43 +10:00
Will Marshall
96913ad922
Changing the order confirmation text with Kirsten
2014-04-11 13:33:13 +10:00
Will Marshall
65c15ca20b
Changing message for order cycle selector popup
2014-04-11 13:12:40 +10:00
Will Marshall
6e35dc7168
Merging with master
2014-04-11 13:09:22 +10:00
Will Marshall
9f3bf0b8f1
Pending the checkout auth tests, since they're testing a monkeypatch
2014-04-11 12:50:06 +10:00
Will Marshall
2e5425d931
Pulling over some test changes
2014-04-11 12:48:28 +10:00
Will Marshall
33cf05ab83
Manually bringing over the login links for checkout
2014-04-11 12:37:32 +10:00
Will Marshall
cf3681b934
Moving over the new checkout authentication
2014-04-11 12:26:36 +10:00
Rob H
c01050361e
Use coffeescript syntactic sugar
2014-04-11 10:33:49 +10:00
Rob H
ff531f0e18
Producers can only list line items which contain products they supply
2014-04-11 09:39:01 +10:00
Will Marshall
da241a4eee
Removing some debugging
2014-04-10 17:26:00 +10:00
Will Marshall
831e53dc6e
Displaying server errors as well
2014-04-10 17:21:34 +10:00
Will Marshall
7fc3d4b7cc
Moving to a switch
2014-04-10 17:02:43 +10:00
Will Marshall
acd8d2d8a2
Adding payment controller for consistency
2014-04-10 16:35:03 +10:00
Will Marshall
5f62cb7ddb
Working with ngForm and subcontrollers. Also fixing bulk order specs
2014-04-10 16:32:08 +10:00
Rob H
e114aecfd0
Merge branch 'master' into bom
2014-04-10 16:30:13 +10:00
Rob H
e64bfe8ba3
Fix failing API Orders spec
2014-04-10 16:26:24 +10:00
Rob H
6228cc0c55
BOM: Add order cycle column
2014-04-10 15:34:23 +10:00
Rob H
5c7d36ba9b
BOM: interface cleanup and adding 'Clear All' button for filters
2014-04-10 15:29:09 +10:00
Will Marshall
00f5d09d65
Moving our inputs to magical helpers
2014-04-10 14:48:22 +10:00
Will Marshall
8b40092310
Starting to reflow the controllers
2014-04-10 14:27:32 +10:00
Will Marshall
621e58f67a
First stab at a DRY implementation
2014-04-10 12:54:18 +10:00
Rob H
645b6d5a8f
BOM: change datetimepickers to datepickers
2014-04-10 10:51:55 +10:00
Rob H
c5d5f5a9e6
BOM: view information about max quantities ordered
2014-04-10 10:33:57 +10:00
Will Marshall
35d590c926
Fixing a bug uploading promo images
2014-04-09 15:53:39 +10:00
Will Marshall
093004a460
Clearing the cart when order cycle is changed
2014-04-09 15:40:41 +10:00
Will Marshall
873de1d118
Able to submit Checkout form via Ajax
2014-04-09 15:31:15 +10:00
Will Marshall
36a4e34dff
Preprocessing order attributes, returning path
2014-04-09 15:04:17 +10:00
Rohan Mitchell
2bfbce65d8
Use domain instead of IP for Jenkins badge in README
2014-04-09 15:02:41 +10:00
Rohan Mitchell
3d0b24cc97
Add missing foreign key indexes
2014-04-09 15:02:41 +10:00
Rohan Mitchell
a91ea933cc
Destroy adjustment metadata when adjustment is destroyed
2014-04-09 15:02:41 +10:00
Rohan Mitchell
e792107d7b
Make order cycle specs more robust
2014-04-09 15:02:40 +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
87a43fc36e
Fixing the build! Some minor bugs due to mailer changes
2014-04-09 12:19:52 +10:00
Rohan Mitchell
511938e41b
Merge pull request #227 from folklabs/tools
...
Add CodeClimate and Jenkins badges to readme
2014-04-09 11:58:52 +10:00
Will Marshall
09d22f74ec
Renaming some methods in our experimental
2014-04-09 11:51:12 +10:00
Will Marshall
b293efd110
Fixing issue at https://github.com/angular/angular.js/wiki/Understanding-Scopes - hiding our attributes inside objects so child scopes can access them safely
2014-04-08 18:39:50 +10:00
Will Marshall
4bb9776233
Adding bindonce and infinite scroll to karma
2014-04-08 18:16:46 +10:00
Will Marshall
101a4a0bed
Fixing a typo
2014-04-08 18:11:07 +10:00
Will Marshall
2de5988acd
Merging
2014-04-08 18:10:16 +10:00
Will Marshall
e641d2a788
Starting to add inline validation and behaviour to checkout
2014-04-08 18:09:03 +10:00
Will Marshall
ffb21cfc49
Fixing a scoping issue
2014-04-08 18:09:03 +10:00
Will Marshall
8495c13063
Patching local storage; authentication actions
2014-04-08 18:09:02 +10:00
Will Marshall
a4cba99de6
Starting to rework checkout Login links
2014-04-08 18:09:02 +10:00
Will Marshall
f2157e0356
Fixing a couple of spec bugs
2014-04-08 18:09:02 +10:00
Will Marshall
8084262efe
Patching a test and removing our duped Angular libs
2014-04-08 18:09:02 +10:00
Will Marshall
5ac5b74f01
Setting up a Rake task for Jasmine/Karma
2014-04-08 18:09:02 +10:00
Will Marshall
195f62dba1
Basics in place, about to rework karma config
2014-04-08 18:09:02 +10:00
Will Marshall
b99fe20b7c
Adding some SUPER clever magic and fixing some regression issues
2014-04-08 18:07:55 +10:00
Will Marshall
0f1f8975e1
Starting on the improved accordion checkout
2014-04-08 18:07:55 +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
a73b714d9e
Changing the confirm email text a little bit
2014-04-08 18:07:55 +10:00
Will Marshall
a1eae915c8
Adding a helpful comment
2014-04-08 18:07:55 +10:00
Will Marshall
908e799326
Patching one test and simplifying the modifications to order cycle tooltip
2014-04-08 18:07:55 +10:00
Will Marshall
23597997b4
Getting in notification to select order cycle
2014-04-08 18:06:49 +10:00
Will Marshall
b6c746f5b8
Adding a signup confirmation email
2014-04-08 18:06:49 +10:00
Will Marshall
330b2100cc
Text change
2014-04-08 18:06:49 +10:00
Rohan Mitchell
298055bdbb
Order cycle can have the same enterprise participating as supplier, coordinator and distributor
2014-04-08 18:06:49 +10:00
Rohan Mitchell
9687e8867e
Fix order cycle failing to save after a failing submit to server
2014-04-08 18:06:49 +10:00
Rohan Mitchell
645c422d9e
Fix silent fail when order cycle coordinator not filled out
2014-04-08 18:06:48 +10:00
Rohan Mitchell
566b58f3cb
Fix deployment issue: sass-rails needs to be in default group for application.rb config, and in assets group so that it's required.
2014-04-08 18:06:48 +10:00
Will Marshall
fcb04481c4
Fixing a nil chain bug
2014-04-08 17:55:09 +10:00
Will Marshall
d2c5c6dcaf
Starting to add inline validation and behaviour to checkout
2014-04-08 17:52:54 +10:00
Will Marshall
9f60f6dab3
Fixing a scoping issue
2014-04-08 15:10:30 +10:00
Will Marshall
0b28e18225
Patching local storage; authentication actions
2014-04-08 15:05:39 +10:00
Will Marshall
806f3348c0
Starting to rework checkout Login links
2014-04-08 14:34:50 +10:00
Will Marshall
1d544aa003
Fixing a couple of spec bugs
2014-04-08 14:11:28 +10:00
Will Marshall
a2f62c158a
Patching a test and removing our duped Angular libs
2014-04-08 13:40:45 +10:00
Will Marshall
fca9ba284e
Setting up a Rake task for Jasmine/Karma
2014-04-08 13:25:35 +10:00
Will Marshall
f6c173d0de
Basics in place, about to rework karma config
2014-04-08 12:58:37 +10:00
Will Marshall
fbcf06f5f5
Adding some SUPER clever magic and fixing some regression issues
2014-04-07 18:23:37 +10:00
Will Marshall
577c91aca5
Starting on the improved accordion checkout
2014-04-07 16:15:19 +10:00
Will Marshall
4447730505
Removing nothing special text and patching change password form slightly more
2014-04-07 14:52:01 +10:00
Will Marshall
1e04a3b5f7
Changing the confirm email text a little bit
2014-04-07 14:31:02 +10:00
Will Marshall
6ae51eabe3
Adding a helpful comment
2014-04-07 14:29:42 +10:00
Will Marshall
902eefa8bb
Patching one test and simplifying the modifications to order cycle tooltip
2014-04-07 14:15:15 +10:00
Will Marshall
1c22a2c848
Getting in notification to select order cycle
2014-04-07 13:14:32 +10:00
Rob H
aad5ad4bc0
BOM interface cleanup
2014-04-06 19:22:17 +10:00
Rob H
0a6230088d
Make BOM bulk action dropdown pretty
2014-04-06 17:39:53 +10:00
Rob H
5cec4feb7e
Remove search boxes from filter BPE filter boxes
2014-04-05 10:17:21 +11:00
Rob H
366555d9a7
Remove old column toggle from BOM
2014-04-05 10:08:37 +11:00
Rob H
b1c7f06779
Add dropdown.js.coffee to karma config to stop tests failing
2014-04-05 10:06:58 +11:00
Rob H
980797493d
Create dropdown list for toggling columns
2014-04-04 19:36:06 +11:00
Will Marshall
5c999fd9cf
Adding a signup confirmation email
2014-04-04 12:36:33 +13:00
Will Marshall
44049da3cb
Text change
2014-04-04 12:36:12 +13:00
Rob H
8e54bf1e2e
Enterprise users are aurthorised to view BOM
2014-04-04 09:11:56 +11:00
Will Marshall
017ed1b937
Adding an infinite scroll filter to reduce page load times, hopefully
2014-04-03 10:34:04 +13:00
Will Marshall
718e295f3f
Some more minor test fiddling
2014-04-03 10:34:04 +13:00
Will Marshall
3574c91790
Patching a bug with bo-src
2014-04-03 10:34:04 +13:00
Will Marshall
a8a2e36375
Some more minor test fiddling
2014-04-03 10:34:03 +13:00
Will Marshall
79322fbab4
Some more minor refactoring
2014-04-03 10:34:03 +13:00
Will Marshall
b9e8d5ce67
Reworking the tests a little more for FASTER
2014-04-03 10:34:03 +13:00
Will Marshall
74d96a5a07
Undoing previous change: no performance fix
2014-04-03 10:34:03 +13:00
Will Marshall
a73d174009
Fast version of OC selection
2014-04-03 10:34:03 +13:00
Will Marshall
bf6eb4ace1
Refactoring checkout specs some more
2014-04-03 10:34:03 +13:00
Will Marshall
a4fcabe11f
Reworking the checkout spec slightly
2014-04-03 10:34:03 +13:00
Will Marshall
f3f676ce26
gs
2014-04-03 10:34:03 +13:00
Will Marshall
a040c150cf
Tweaking the change hub text
2014-04-03 10:34:02 +13:00
Rohan Mitchell
32ffd05ba0
Order cycle can have the same enterprise participating as supplier, coordinator and distributor
2014-04-02 11:54:28 +11:00
Rohan Mitchell
98d599e5f7
Fix order cycle failing to save after a failing submit to server
2014-04-02 11:38:59 +11:00
Rohan Mitchell
9e74a72985
Fix silent fail when order cycle coordinator not filled out
2014-04-02 10:35:16 +11:00
Rohan Mitchell
e2fb593baf
Fix deployment issue: sass-rails needs to be in default group for application.rb config, and in assets group so that it's required.
2014-04-02 08:55:25 +11:00
Will Marshall
d9e86ae395
Some more minor refactoring
2014-04-01 16:58:50 +11:00
Will Marshall
bd4623bc71
Reworking the tests a little more for FASTER
2014-04-01 14:11:48 +11:00
Will Marshall
749abd82e8
Undoing previous change: no performance fix
2014-04-01 14:02:25 +11:00
Will Marshall
da479b7534
Fast version of OC selection
2014-04-01 14:01:57 +11:00
Will Marshall
5153c44aa0
Refactoring checkout specs some more
2014-04-01 13:53:37 +11:00
Will Marshall
f8f37abe32
Reworking the checkout spec slightly
2014-04-01 13:44:36 +11:00
Will Marshall
02fd21d99e
gs
2014-04-01 13:29:35 +11:00
Will Marshall
a4e19ddc98
Tweaking the change hub text
2014-04-01 13:12:16 +11:00
Will Marshall
42cbfdc04f
Adding bindonce to product page
2014-04-01 13:01:53 +11:00
Will Marshall
403ad797ac
Tidying up the cart
2014-04-01 12:42:42 +11:00
Will Marshall
e51f1b508d
Fixing the empty cart button
2014-04-01 12:39:47 +11:00
Will Marshall
e203d811b9
Adding some links to account sidebar
2014-04-01 12:31:02 +11:00
Will Marshall
1b69087a1c
Loading indicator
2014-04-01 12:01:51 +11:00
Will Marshall
11a6470d6d
Patching modals
2014-04-01 11:39:08 +11:00
Will Marshall
bda1ef5513
Adding a cart icon with count
2014-03-28 17:09:16 +11:00
Rob H
00df441bc2
Re-add changes to variant bulk show to fix 'I'm a teapot' fails
2014-03-28 16:47:52 +11:00
Will Marshall
5d36dc5b4f
Moving User Account to darkswarm
2014-03-28 16:02:32 +11:00
Will Marshall
784df982d6
Disabling the link when the previous distributor is the old distributor
2014-03-28 16:02:32 +11:00
Will Marshall
6f50c45bba
Adding the last checkout distributor to the account link
2014-03-28 16:02:32 +11:00
Will Marshall
197f1cfa72
Further improving the navigation
2014-03-28 16:02:32 +11:00
Will Marshall
e1465352d0
Improving the navigation by moving it all to a service, adding a generic icon
2014-03-28 16:02:31 +11:00
Will Marshall
12b1a1b0e9
Switching our recover password form to Darkswarm
2014-03-28 16:02:31 +11:00
Rohan Mitchell
a97f0439e1
Fix 'undefined method sass' - we need sass-rails in production env
2014-03-28 15:57:29 +11:00
Rohan Mitchell
da6ba04780
Update variant weight from unit value when unit is weight
2014-03-28 15:34:26 +11:00
Rohan Mitchell
466b10e797
Select all distributed products on order cycle admin page
2014-03-28 15:34:26 +11:00
Rohan Mitchell
fddfdf8050
Select all supplied products on order cycle admin page
2014-03-28 15:34:26 +11:00
Rohan Mitchell
b8147474e8
Add label tags around order cycle admin checkboxes and labels
2014-03-28 15:34:26 +11:00
Rob H
b74a845875
Merge branch 'master' into bom
2014-03-28 14:42:15 +11:00
Rob H
ee147c232e
WIP: Remove changes to variant bulk show casuing issues
2014-03-28 14:41:03 +11:00
Rob H
771ccc6e76
Merge branch 'capybara-fails' into bom
2014-03-28 13:52:17 +11:00
Rob H
73271fa45a
Fix BOM regression bugs caused by capybara upgrade
2014-03-28 13:50:10 +11:00
Rob H
4d65427d18
Fix BPE regression bugs caused by capybara upgrade
2014-03-28 12:11:36 +11:00
Paul Mackay
da2b424c45
#227 : Replace Travis with Jenkins badge.
2014-03-27 09:17:13 +00:00
Will Marshall
89fcf50762
Tidying up tabs
2014-03-27 16:36:12 +11:00
Will Marshall
08c25b1604
Getting a success message in place
2014-03-27 16:26:22 +11:00
Will Marshall
54491e0de2
Syncing up the email addresses between the SpreeUser tabs
2014-03-27 16:17:51 +11:00
Will Marshall
d8160bc6d5
Partially fixing the visible issue
2014-03-27 16:12:18 +11:00
Rob H
ab14bf70ab
Merge branch 'bpe_issues' into bom
2014-03-27 15:39:37 +11:00
Rob H
dae2d9db9e
BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update
2014-03-27 15:38:44 +11:00
Rob H
2b035459fd
BPE: Adding blank filters alerts the user
2014-03-27 15:13:00 +11:00
Will Marshall
e48a25983a
Starting a working forgot password system
2014-03-27 15:11:11 +11:00
Will Marshall
adcd5e1c8d
Fixing a regression issue
2014-03-27 14:30:52 +11:00
Rob H
9c65dd2ace
BOM: add warning message about missing unit values to group buy calc box
2014-03-27 14:18:00 +11:00
Rob H
0c2e215fef
BOM: Add a method to check that all selected variants have a unit_value
2014-03-27 14:11:19 +11:00
Will Marshall
2be9ad7dd0
Starting with our own passwords controller
2014-03-27 13:52:02 +11:00
Will Marshall
2158937f82
Adding a sidebar tab
2014-03-27 13:34:38 +11:00
Rob H
a260a3fa56
BOM: Fixed bug causing Order Cycles filter to break in some cases
2014-03-27 13:32:26 +11:00
Will Marshall
b5f1464ce9
Patching more regression issues
2014-03-27 13:01:06 +11:00
Will Marshall
3976694dad
Patching up some regressions
2014-03-27 13:01:05 +11:00
Will Marshall
e444ff8d2c
Patching order cycle selector
2014-03-27 13:01:05 +11:00
Will Marshall
17bb1f9d25
Getting the tests working once more
2014-03-27 13:01:05 +11:00
Will Marshall
67762317cb
Removing close link
2014-03-27 13:01:05 +11:00
Will Marshall
a89de9a80f
Patching our patch
2014-03-27 13:01:04 +11:00
Will Marshall
007428b6dc
Splitting between path and hashfragment for offcanvas and tabs respectively
2014-03-27 13:01:04 +11:00
Will Marshall
c118a86119
Latest snapshot of the patched mm-foundation, and a quick tab implementation sidebar
2014-03-27 13:01:04 +11:00
Will Marshall
cdfaf4fc92
Temporary working version with hacked Foundation/Angular/Tabs
2014-03-27 13:01:04 +11:00
Will Marshall
f5a0341851
Notes for the tabs controller
2014-03-27 13:01:03 +11:00
Will Marshall
166c8c3df4
Adding the basic Angular tabs and changed markup to keep it pretty
2014-03-27 13:01:03 +11:00
Will Marshall
80fe3f7adf
Starting dedicated tabs stylesheet
2014-03-27 13:01:03 +11:00
Will Marshall
61e6050e3a
Fixing up some more minor regression bugs
2014-03-27 13:01:03 +11:00
Will Marshall
d4f26c9ef1
Moving foundation out of assets group
2014-03-27 13:01:02 +11:00
Will Marshall
d637deeb19
Patching a Foundation bug w/ tests
2014-03-27 13:01:02 +11:00
Will Marshall
e4bb2f1cdf
Keeping Foundation 4 and 5 parallel
2014-03-27 13:01:02 +11:00
Will Marshall
8f56b829cb
Adding foundation 4 in namespace
2014-03-27 13:01:01 +11:00
Will Marshall
bf7d12b40e
Upgrading Foundation, starting to work through regression issues
2014-03-27 13:01:01 +11:00
Will Marshall
0690fcda48
Reworking the way the Sidebar works
2014-03-27 11:54:25 +11:00
Rohan Mitchell
93db813b3a
Make current_producers helper more resilient
2014-03-27 10:25:05 +11:00
Rohan Mitchell
ce2882de35
OrderCycleFormApplicator uses exchanges.incoming instead of role
2014-03-27 09:49:08 +11:00
Rohan Mitchell
3104d285ca
Order cycle admin JS uses exchanges.incoming instead of role
2014-03-27 09:30:53 +11:00
Paul Mackay
cc8e3537d1
Add Travis badge.
2014-03-26 19:42:03 +00:00
Paul Mackay
48a76fe790
Add Code Climate badge.
2014-03-26 19:37:55 +00:00
Rob H
cd1086ce05
WIP: Bulk calculation box work with shared resources
2014-03-26 16:44:26 +11:00
Rohan Mitchell
71273dfc7f
Refactor Product to use exchanges.incoming instead of sender/receiver roles
2014-03-26 16:36:09 +11:00
Rohan Mitchell
20745825bf
Fix finding producers for shopfront, moving to SQL-land in the process. Woo.
2014-03-26 12:56:58 +11:00
Rohan Mitchell
ec0191806a
Update specs to explicitly specify exchange direction
2014-03-26 12:17:49 +11:00
Rohan Mitchell
abf83b0e58
Find only outgoing exchanges for Enterprise scopes using with_order_cycles_outer
2014-03-26 12:07:06 +11:00
Rohan Mitchell
ac8990f7e7
Rename enterprises_spec to singular for consistency
2014-03-26 11:46:51 +11:00
Rohan Mitchell
f184f0c246
Fix inappropriate intimacy: Extract exchange-specific queries from OrderCycle back into exchange
2014-03-26 11:43:32 +11:00
Rohan Mitchell
ac92d0919a
Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles
2014-03-26 11:19:35 +11:00
Will Marshall
57ca48dc4a
Fixing one failing spec
2014-03-21 15:18:28 +11:00
Will Marshall
b623a64fb4
Working signup :)
2014-03-21 15:18:27 +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
Rob H
cbd3722380
Merge branch 'master' into bom
2014-03-21 13:47:50 +11:00
Rob H
f2729f9e80
Add more columns to BOM
2014-03-21 13:46:48 +11:00
Rob H
7302d0552e
Fixing js specs
2014-03-21 13:11:04 +11:00
Rob H
b329aed0f2
BOM: Can toggle columns, and interface rearrange
2014-03-21 13:00:12 +11:00
Will Marshall
250e1d236b
Working login form
2014-03-20 16:58:58 +11:00
Will Marshall
dbc8e1bcf1
Reworking the tests for the new app
2014-03-20 16:58:57 +11:00
Will Marshall
7f88b8eb39
Switching to separate controllers for ze sidebar
2014-03-20 16:58:57 +11:00
Will Marshall
d8a7860d51
Getting some switching into place
2014-03-20 16:58:57 +11:00
Will Marshall
0cabc2eb4d
Working sliding panel in basic form
2014-03-20 16:58:57 +11:00
Will Marshall
d954a8f4e4
Starting on the sidebar
2014-03-20 16:58:57 +11:00
Will Marshall
6e5c93526c
Moving everything to a single Angular application
2014-03-20 16:58:57 +11:00
Rob H
048b8b43cc
Bulk Actions only apply to visible line items
2014-03-20 16:54:24 +11:00
Rob H
43863069e9
Minor fix to BOM group buy calc box
2014-03-20 16:07:14 +11:00
Rob H
8c998e6fa8
BOM: columns are sortable
2014-03-20 15:39:13 +11:00
Rohan Mitchell
c563057809
Merge branch 'new-enterprises-form'
2014-03-20 15:34:09 +11:00
Rohan Mitchell
51fdf86329
Polish the new enterprise form
2014-03-20 15:18:21 +11:00
Rob H
ed0b7da20f
BOM page has a fancy calculation box for managing group buys
2014-03-20 14:40:24 +11:00
Rohan Mitchell
4aace221ea
Enterprise user can reorder product properties and update product images
2014-03-20 11:41:08 +11:00
Rohan Mitchell
af88d0f91b
Fix regression: Invisible checkbox causing ambiguity for capybara
2014-03-20 11:07:13 +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
Rohan Mitchell
811b0cb36a
Admin can remove a master variant from an order cycle when further variants have been added
2014-03-20 10:27:55 +11:00
Rohan Mitchell
fd81b143b5
Sort suppliers and distributors by name on order cycle edit page
2014-03-20 10:27:55 +11:00
Maikel Linke
fcd9389fe3
spec for pickup details in enterprise form removed
2014-03-19 20:42:21 +11:00
Maikel Linke
f3789469b2
Feedback from Kerstin. Resolved issue comments removed. Pickup details removed.
2014-03-19 20:42:21 +11:00
Maikel Linke
7d30d8e28f
old deface files deleted. spec for enterprise form updated
2014-03-19 20:42:21 +11:00
Maikel Linke
9181f0243a
added old input fields, enterprises test passing
2014-03-19 20:42:21 +11:00
Maikel Linke
cc2ae2f464
moved fullwidth form css
2014-03-19 20:42:21 +11:00
Maikel Linke
aa7211dc7f
more tooltips
2014-03-19 20:42:21 +11:00
Maikel Linke
6689b0d93f
more tooltips
2014-03-19 20:42:21 +11:00
Maikel Linke
052782678e
working design. TODOs are optional now
2014-03-19 20:42:21 +11:00
Maikel Linke
e9506d1571
complete form with columns. two things to ask Kerstin.
2014-03-19 20:42:21 +11:00
Maikel Linke
4c0885277d
started to redesign form with css
2014-03-19 20:42:21 +11:00
Maikel Linke
6f1d41e020
new selection of input fields for enterprises form, not all datafields working yet
2014-03-19 20:42:21 +11:00
Maikel Linke
510333288c
first steps of new design
2014-03-19 20:42:21 +11:00
Will Marshall
c6f1d43dbd
Reworking the shipping confirmation
2014-03-19 16:09:45 +11:00
Will Marshall
8e363e5fbb
Caching values for variants
2014-03-19 15:40:57 +11:00
Will Marshall
ba770d8eac
Removing the add to cart spec
2014-03-19 15:28:48 +11:00
Will Marshall
49dc371219
Adding the missing bulk buy spec
2014-03-19 15:25:36 +11:00
Will Marshall
946913fc53
Better documentation
2014-03-19 15:19:58 +11:00
Will Marshall
a1c8a35e79
Disabling CMS specs
2014-03-19 15:19:15 +11:00
Will Marshall
09e6caf039
Archiving and disabling old checkout spec
2014-03-19 14:34:51 +11:00
Will Marshall
dc8418cb4c
Removing the taxonomy spec, with a comment about some possibly redundant spree overrides
2014-03-19 14:29:46 +11:00
Will Marshall
9f36bc1383
Removing dud specs from suppliers spec
2014-03-19 14:25:13 +11:00
Will Marshall
fae167884d
Removing the product spec
2014-03-19 14:23:18 +11:00
Will Marshall
acc9ebf836
Removing order cycle spec
2014-03-19 14:22:37 +11:00
Will Marshall
922724135b
Removing distributors spec
2014-03-19 14:15:54 +11:00
Will Marshall
b88571a6f0
Removing redundant spec
2014-03-19 14:14:51 +11:00
Will Marshall
abf1b17fe9
Taking payment methods with no distributor out of circulation
2014-03-19 12:03:39 +11:00
Will Marshall
3df3afe068
Quantities for bulk not getting lost now
2014-03-19 11:09:45 +11:00
Will Marshall
df6cbc049f
Making sure quantities don't get lost
2014-03-19 11:09:02 +11:00
Will Marshall
82c29683d6
Disabling enter on the search
2014-03-19 11:06:18 +11:00
Will Marshall
01503632f2
Changing cart titles
2014-03-19 10:52:26 +11:00
Will Marshall
8435dfabb1
Changing the cart summary text
2014-03-19 10:49:57 +11:00
Will Marshall
9c26d23cb5
Greying the buttons like a boss
2014-03-19 10:48:49 +11:00
Will Marshall
a8547a9e64
Adjustments toggling
2014-03-19 10:45:40 +11:00
Will Marshall
d5b1cc3303
Swapping buttons
2014-03-19 10:40:30 +11:00
Will Marshall
90159325bf
Patching a test
2014-03-18 17:38:33 +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
96ce982ea3
Reworking the checkout into Darkswarm, patching up tests
2014-03-18 15:58:22 +11:00
Will Marshall
3b27690c7c
Fixing two dud specs
2014-03-14 19:25:34 +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
ac78ab91fe
Fixing up some regression issues
2014-03-14 16:54:43 +11:00
Will Marshall
19cf6a5d2c
Default payment method when none in params
2014-03-14 16:40:26 +11:00
Will Marshall
758b705b64
Removing non-existent images
2014-03-14 16:30:34 +11:00
Will Marshall
66bc84920a
Putting the Foundation modals in position: fixed
2014-03-14 16:26:00 +11:00
Will Marshall
01e8060ff0
Putting blank footer back
2014-03-14 16:22:45 +11:00
Will Marshall
a954f2c21a
Basic Darkswarm version of the Order Confirmation page
2014-03-14 16:11:40 +11:00
Will Marshall
c01b198f95
Minor tweaks
2014-03-14 15:34:18 +11:00
Will Marshall
7dd2366c22
Tweaking a label
2014-03-14 13:17:42 +11:00
Will Marshall
f1f501c7ee
Getting the total price into Javascript as well
2014-03-14 13:15:42 +11:00
Will Marshall
fc4f108724
Adding tests and views to handle changing shipping prices
2014-03-14 12:59:37 +11:00
Will Marshall
dc95d764fe
Fixing some edge cases in the addresses
2014-03-14 11:56:25 +11:00
Will Marshall
10fe24db32
Patching up the presentation of the modals
2014-03-14 11:56:24 +11:00
Will Marshall
8bac32ebdf
Adding distribution info to the About panel
2014-03-14 11:56:24 +11:00
Will Marshall
2ac7fe3652
Tweaking checkout links
2014-03-14 11:56:24 +11:00
Rohan Mitchell
8f0625daf8
Move product-related spec out of variants and into its proper home
2014-03-14 11:18:59 +11:00
Rohan Mitchell
98776caa51
Rename Exchange.any_variant to with_any_variant for clarity
2014-03-14 11:18:59 +11:00
Rohan Mitchell
affb2a5743
Fix bug: Whole order fees being charged once per variant. Exchange.any_variant was returning duplicate rows.
2014-03-14 11:18:59 +11:00
Rob H
c86cfe092f
BOM: Add bulk delete action
2014-03-14 09:37:28 +11:00
Will Marshall
07fec3c892
Caching payment method selection
2014-03-13 15:40:44 +11:00
Will Marshall
4e03f97f1f
Improving links
2014-03-13 14:52:51 +11:00
Will Marshall
3370865a01
Adding group siblings to the shop page
2014-03-13 14:50:06 +11:00
Will Marshall
179844b5cf
Fixing another spec
2014-03-13 14:32:14 +11:00
Will Marshall
f6321afbb5
Fixing up a bunch of specs to accommodate the new routing
2014-03-13 13:51:32 +11:00
Will Marshall
0c18a9c790
Changing links on cart
2014-03-13 11:56:55 +11:00
Will Marshall
9c655a855e
Redirecting to the shop page when a distributor is selected
2014-03-13 11:47:55 +11:00
Will Marshall
1ba720481f
Finally fixing the same as billing address checkbox?
2014-03-13 11:41:46 +11:00
Will Marshall
e7bed58616
Removing text as per #327
2014-03-13 11:25:06 +11:00
Will Marshall
8a7dad020b
Modifying the back to cart button
2014-03-13 11:24:33 +11:00
Rob H
9a291e28ec
Add bulk action checkboxes to BOM
2014-03-12 18:25:51 +11:00
Will Marshall
7c50e1a41d
Fixing up the specs
2014-03-12 17:17:07 +11:00
Rob H
9230bce6bb
An acceptable quantity of products is added to cart
2014-03-12 17:12:49 +11:00
Will Marshall
35bd1257d9
Opening variants by default
2014-03-12 15:23:35 +11:00
Will Marshall
c08f739d4a
Minor HTML changes
2014-03-12 15:13:25 +11:00
Will Marshall
9848a724b7
Adding Back to Cart link
2014-03-12 15:09:00 +11:00
Will Marshall
f96e420f01
Re-arranging our radio boxes
2014-03-12 15:09:00 +11:00
Will Marshall
2f7688f864
Switching some form order
2014-03-12 15:08:59 +11:00
Will Marshall
a1ed951931
Default shipping address same as billing address, rendering data panel for pickup info
2014-03-12 15:08:59 +11:00
Will Marshall
3ec80aaaa3
Styling improvements to the popups for producers
2014-03-12 15:08:59 +11:00
Will Marshall
f73cd3db7d
Adding producer details popups
2014-03-12 15:08:59 +11:00
Rohan Mitchell
0d97397084
Fix fragile specs (ordering)
2014-03-12 15:00:20 +11:00
Rohan Mitchell
f7d8d866eb
Show two linebreaks for end of block level tags, strip whitespace from end of string
2014-03-12 13:52:13 +11:00
Rohan Mitchell
011668c0b6
Display line breaks in order confirmation email distributor info
2014-03-12 13:34:34 +11:00
Rohan Mitchell
a8373b7bef
Fix specs: stale data
2014-03-12 13:34:05 +11:00
Rohan Mitchell
4d8a23346c
Fix bug: Unselecting product variant unit in BPE doesn't save
2014-03-12 12:35:52 +11:00
Rohan Mitchell
356099a49a
When product unit changed, remove option types from master as well as other variants
2014-03-12 12:35:52 +11:00
Rohan Mitchell
93a661ac08
Do not show product unit fields when creating a new product - make this interface less confusing
2014-03-12 12:35:52 +11:00
Rohan Mitchell
0b39db0165
Display Rails env on landing page in dev and staging
2014-03-12 12:35:52 +11:00
Rohan Mitchell
af31d0cb8f
Reformat
2014-03-12 12:35:52 +11:00
Rohan Mitchell
98e9f7d7e1
Add custom noimage image for spree
2014-03-12 12:35:51 +11:00
Rohan Mitchell
68eaa61732
Enterprise user can delete product images
2014-03-12 12:35:51 +11:00
Will Marshall
57eb65f721
Adding an accessor for requires shipping address
2014-03-12 12:07:41 +11:00
Will Marshall
451e76b33f
Tweaking our paypal express plumbing further
2014-03-07 15:27:52 +11:00
Will Marshall
40c986892e
Patching the paypal test
2014-03-07 15:18:26 +11:00
Will Marshall
df435c0a38
Adding Paypal plumbing
2014-03-07 15:10:20 +11:00
Rob H
bed1c171b6
BOM: display product name and unit
2014-03-07 14:46:40 +11:00
Will Marshall
5790392430
Bypassing the stage check on the Paypal callbacks
2014-03-07 14:10:49 +11:00
Will Marshall
e5cea07d9e
Splitting out shopping spec, starting on Paypal plumbing
2014-03-07 13:18:53 +11:00
Will Marshall
d00ade8137
Splitting out shopping spec, starting on Paypal plumbing
2014-03-07 13:18:30 +11:00
Rob H
b6bd07abd3
BOM: show name from billing address
2014-03-07 12:56:39 +11:00
Rob H
ea3bd86318
Make enterprise factory get it own address
2014-03-07 12:14:09 +11:00
Will Marshall
dfcaab36fa
Patching a minor regression bug
2014-03-07 09:56:17 +11:00
Will Marshall
84955d3647
Merging master
2014-03-06 16:53:03 +11:00
Will Marshall
904a25fd18
Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx
2014-03-06 16:48:30 +11:00
Will Marshall
12f39ce511
Patching up some more address bugs
2014-03-06 16:46:56 +11:00
Rob H
641796ed64
BOM: and quick search
2014-03-06 16:32:23 +11:00
Will Marshall
d677116ea3
Overring before_address to conform to our new checkout as necessary
2014-03-06 16:24:08 +11:00
Will Marshall
cc3fb27490
Restoring the old checkout, but NOW our new checkout is broken
2014-03-06 16:16:00 +11:00
Rob H
483e9d80bc
BOM: filters work in combination
2014-03-06 13:21:31 +11:00
Rob H
43a4a3dd5a
Alter on_hand counts for products to fix broken specs
2014-03-06 13:14:06 +11:00
Rob H
200e3fef77
Merge branch 'master' into bom
2014-03-06 12:52:36 +11:00
Rob H
068a6ebd95
Fix checkout specs
2014-03-06 12:49:29 +11:00
Will Marshall
a40a0499e4
Reducing the number of country and state options
2014-03-06 11:33:38 +11:00
Will Marshall
2301f2372f
Defaulting the quantity fields to nil
2014-03-06 11:04:11 +11:00
Will Marshall
e146bb0dd0
Adding Quick Checkout link
2014-03-06 11:01:25 +11:00
Rob H
0726d591ac
BOM: can filter by order cycle
2014-03-06 10:50:27 +11:00
Rohan Mitchell
24d97bd754
Fix spec race condition
2014-03-06 10:36:49 +11:00
Will Marshall
56646ca5e3
Getting some form state into the Order
2014-03-06 10:26:51 +11:00
Rohan Mitchell
07caf99488
Enterprise user can delete product properties
2014-03-05 16:52:06 +11:00
Rohan Mitchell
922d817748
Product list view: For product with variants, show product price as min(variant prices)
2014-03-05 16:16:42 +11:00
Will Marshall
7d0fdead7a
Refactoring the way we default shipping_method_id
2014-03-05 15:49:47 +11:00
Will Marshall
3c108d3366
Improving the test suite, refactoring the form and Checkout controller to use data injection instead of haxxx
2014-03-05 15:31:41 +11:00
Rohan Mitchell
b89c84e8bd
BPE: Do not show product price when product has variants
2014-03-05 15:08:54 +11:00
Rohan Mitchell
07d979b38f
Collapse specs into one, halves spec runtime
2014-03-05 14:07:07 +11:00
Rohan Mitchell
637ccc113b
Do not show products that have no stock available to the current distribution
2014-03-05 13:54:02 +11:00
Rohan Mitchell
17debd9fad
On product list view, do not show variants that are out of stock
2014-03-05 13:54:02 +11:00
Rohan Mitchell
8234812157
Do not include master when outputting variants for oc/d
2014-03-05 13:54:02 +11:00
Rohan Mitchell
ec6f70c145
On product list view, only show variants that are a member of the current order cycle
2014-03-05 13:54:02 +11:00
Will Marshall
19350eeade
Adding the 'same as billing address' JS
2014-03-05 12:29:49 +11:00
Rob H
1635e7338e
Add ditributors and suppliers to OC show API
2014-03-05 12:17:08 +11:00
Rob H
fc65eefcfd
Add basic order cycle API
2014-03-05 12:00:26 +11:00
Will Marshall
66866f09b5
Adding the require ship address flag to admin UI:
2014-03-05 11:12:23 +11:00
Rob H
9f19e91e90
Merge branch 'master' into bom
2014-03-05 10:15:39 +11:00
Rob H
2a713245a8
BOM: date filter refactor and works with pending changes
2014-03-05 10:14:35 +11:00
Will Marshall
8b840388c8
Merge branch 'master' into checkout
2014-03-04 15:25:42 +11:00
Will Marshall
b5019f12b4
Fixing up a couple of bugs introduced to the old step workflow
2014-03-04 15:07:00 +11:00
Will Marshall
74238b111e
Fixing the order spec
2014-02-28 15:19:57 +11:00
Rohan Mitchell
6934cf236f
Update Rails
2014-02-28 14:34:14 +11:00
Will Marshall
4087d08e8e
Removing a save and open page call
2014-02-28 13:53:58 +11:00
Will Marshall
1d5addb06e
Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses
2014-02-28 13:41:02 +11:00
Will Marshall
86a8b926f3
Adding conditions to the autopopulator for shipping address
2014-02-28 11:53:45 +11:00
Will Marshall
3db601f362
Merge branch 'master' into checkout
2014-02-27 16:29:21 +11:00
Will Marshall
6e05bd63c6
Pending a test that currently breaks
2014-02-27 16:29:03 +11:00
Will Marshall
d6c71d5416
Fixing a nil bug in the referrer handling on login
2014-02-27 16:24:10 +11:00
Will Marshall
4a6c00e592
Removing bangs from stub since it's totes deprecated
2014-02-27 16:15:42 +11:00
Will Marshall
d7921462eb
Removing save and open page call
2014-02-27 16:15:13 +11:00
Will Marshall
4daeac0b14
Removing JMigrate warnings
2014-02-27 16:15:06 +11:00
Will Marshall
c1cdf3e331
Removing some dud debugging stuff, fiddling with the checkout spec
2014-02-27 16:11:17 +11:00
Will Marshall
19fa7200f3
Fixing the login redirection issue
2014-02-27 14:47:56 +11:00
Will Marshall
91a8e1c071
Fixing a Javascript bug
2014-02-27 14:47:33 +11:00
Will Marshall
18f92fbff5
Fixing a nil.id bug
2014-02-27 14:04:04 +11:00
Will Marshall
e92d21ec4e
Patching a scoping bug that broke ALL the tests
2014-02-27 11:44:36 +11:00
Rohan Mitchell
8bb742b3f2
Alphabetise suppliers when adding new product
2014-02-27 11:33:02 +11:00
Rohan Mitchell
3196e28d88
Admin can assign units to a product
2014-02-27 11:29:39 +11:00
Rohan Mitchell
353d2a4d9c
Do not error when creating variant for product without non-unit option type
2014-02-27 11:28:07 +11:00
Will Marshall
85606b2a0d
Merge branch 'master' into checkout
2014-02-27 10:41:39 +11:00
Will Marshall
0bfa36056e
removing some dud Angular crud
2014-02-26 16:15:53 +11:00
Will Marshall
a0abd9c95a
Merge branch 'master' into checkout
2014-02-26 15:52:37 +11:00
Will Marshall
7708bc9f99
Patching up our shipping selection so there's always a default
2014-02-26 15:48:23 +11:00
Rohan Mitchell
adf4c0e387
Sort enterprises by name on enterprise fees admin page
2014-02-26 15:38:41 +11:00
Rohan Mitchell
f7e1befc75
Spec fees_for only sums per-item fees
2014-02-26 15:16:30 +11:00
Will Marshall
f5a3167fac
Patching up the form and update to get form submission working
2014-02-26 15:12:35 +11:00
Rohan Mitchell
11fb6c96a1
Charge per-order fees on orders exactly once
2014-02-26 14:34:30 +11:00
Rohan Mitchell
b720a1d8f2
EnterpriseFee.clear_all_adjustments_on_order clears adjustments from per-order fees
2014-02-26 14:33:28 +11:00
Rohan Mitchell
9dec40703a
Find exchanges with any of a number of variants
2014-02-26 13:49:10 +11:00
Rohan Mitchell
5057e236a9
Find enterprise fees with per-order calculators
2014-02-26 13:48:51 +11:00
Rohan Mitchell
890af85d30
Create per-order adjustments with EnterpriseFeeApplicator
2014-02-26 13:28:05 +11:00
Rohan Mitchell
75c8da1774
Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees
2014-02-26 12:07:38 +11:00
Rohan Mitchell
febbe087e9
Find EnterpriseFees with per-item calculators
2014-02-26 10:39:39 +11:00
Rob H
41c61b3b12
BOM date filters work
2014-02-22 15:51:14 +11:00
Rob H
1f569e4be1
Add loading splash to BOM
2014-02-22 14:49:19 +11:00
Rob H
83e228dc63
Display message when no matching orders found for BOM
2014-02-22 11:48:24 +11:00
Rob H
1b10bf53c0
WIP: BOM loads with orders filtered by default date restrictions
2014-02-22 11:33:36 +11:00
Rohan Mitchell
da8a8e8a1a
Rename method
2014-02-21 15:49:10 +11:00
Rohan Mitchell
08009d4020
Extract application of enterprise fees as adjustments into its own class
2014-02-21 15:48:58 +11:00
Will Marshall
6b75e8c9ef
Switching to f_form_for and :bill_address
2014-02-21 15:19:12 +11:00
Will Marshall
a162f4a108
Adding some spec tweaks
2014-02-21 15:17:18 +11:00
Will Marshall
04ac6f466c
Forcing the class of Country
2014-02-21 15:15:06 +11:00
Will Marshall
b6b5c2889e
Reworking checkout to use f_form_for, show validation, better controller layout
2014-02-21 14:31:03 +11:00
Rob H
5ec7a10e16
Add date filter fields to BOM
2014-02-21 14:01:33 +11:00
Rohan Mitchell
97a6a812b8
Fix product listing appearing on RHS of page on Firefox
2014-02-19 13:44:31 +11:00
Rohan Mitchell
6d1a202800
Fix grammar
2014-02-19 13:32:57 +11:00
Rohan Mitchell
f88b930137
Extract unit_value_with_description into unit_description only when a string starting with a number is provided
2014-02-19 13:32:17 +11:00
Rohan Mitchell
acbf1ed680
Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI
2014-02-19 13:12:52 +11:00
Rohan Mitchell
3f9f24157c
Do not show unit value or description when product does not have a unit-related option type
2014-02-19 12:07:53 +11:00
Rohan Mitchell
3024bbbeb5
Edit unit value and description of variant
2014-02-19 11:56:37 +11:00
Rohan Mitchell
fb42724430
Remove entire field div instead of just the text field
2014-02-19 11:56:10 +11:00
Rohan Mitchell
7b80518621
On admin variant edit page, do not show option values for unit-related option types
2014-02-19 11:29:26 +11:00
Rohan Mitchell
b0cb19e370
Do not show master options text (eg. '1kg') when product has variants
2014-02-18 16:45:57 +11:00
Will Marshall
adb58bc059
Moving from @order to current_order to keep DRY
2014-02-18 15:07:00 +11:00
Will Marshall
6a861de1e1
Reworking the checkout form some more
2014-02-18 14:50:50 +11:00
Rohan Mitchell
4ee4ea7c60
Fix mismatch between client and server variants (ordering issue)
2014-02-18 14:02:17 +11:00
Will Marshall
ece7caa14a
Moving Darkswarm to new Angular version
2014-02-18 14:00:23 +11:00
Will Marshall
3024007bd3
Reworking our page structure to work better with Angular controllers
2014-02-18 13:51:39 +11:00
Rohan Mitchell
547f46fbc9
Deal with unit_value of zero correctly - do not treat as nil
2014-02-18 10:32:36 +11:00
Will Marshall
19e31a264d
Tidying footer contact details
2014-02-14 15:49:16 +11:00
Will Marshall
502dba1b3f
Fixing bug #281
2014-02-14 15:35:40 +11:00
Will Marshall
134d9831fe
Fixing bug #271
2014-02-14 15:34:55 +11:00
Will Marshall
e9178570e9
Committing order summary. NO TESTS YET
2014-02-14 15:18:03 +11:00
Will Marshall
09d8e19c35
DRYING UP MY VIEWS
2014-02-14 14:43:50 +11:00
Will Marshall
a6d58aa498
Partializing and adding yield blocks
2014-02-14 14:40:58 +11:00
Will Marshall
5c498735b0
Moving from new to edit
2014-02-14 14:26:31 +11:00
Will Marshall
a722320ece
Patching up the tests for new content
2014-02-14 13:43:23 +11:00
Will Marshall
3c696b6762
Adding payment method switching
2014-02-14 13:30:28 +11:00
Will Marshall
4704e927e3
Form toggling! Fuck yeah
2014-02-14 11:31:27 +11:00
Will Marshall
25916caeb4
Starting on Angular models for Checkout, pretties
2014-02-13 16:14:11 +11:00
Will Marshall
7f58007c45
Adding some fields to Shipping Methods
2014-02-13 16:12:42 +11:00
Rohan Mitchell
701896be95
BPE: Add variant and save it to server. Edit the saved variant.
2014-02-13 11:52:44 +11:00
Will Marshall
2425de8c98
Basic form implementation
2014-02-13 11:40:52 +11:00
Rohan Mitchell
4d24fec6fb
BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants.
2014-02-13 09:26:07 +11:00
Rohan Mitchell
4aa43cfbe0
Set the master unit value for a product without variants
2014-02-12 13:57:49 +11:00
Will Marshall
871637c4af
NO CAN HAZ EMPTY CART PAGE
2014-02-12 12:31:37 +11:00
Rohan Mitchell
b2ad6c7d57
Filter products for submit includes master variant
2014-02-11 19:23:27 +11:00
Rohan Mitchell
e845c0dc06
Remove derived attributes from master variant
2014-02-11 19:20:46 +11:00
Rohan Mitchell
0b255ed1e9
Pack the master variant before sending to the server
2014-02-11 19:19:12 +11:00
Rohan Mitchell
c7c70252d0
ofnTrackProduct and ofnTrackVariant accept nested properties as arguments
2014-02-11 19:13:11 +11:00
Will Marshall
b11533a629
Renaming ShopController to Shop::ShopController
2014-02-07 16:52:18 +11:00
Will Marshall
7af1d72ef9
Working login and signup forms for checkout, specs, redirect back to checkout on success
2014-02-07 16:07:18 +11:00
Rob H
17456ebf2e
BOM: only fetch completed orders
2014-02-07 15:29:31 +11:00
Will Marshall
63f85fef0e
Starting to get in the login stuff
2014-02-07 14:34:49 +11:00
Will Marshall
cec0ad8a83
Adding ze boilerplate
2014-02-07 13:55:25 +11:00
Will Marshall
26e4adf7a6
Adding the routes, controller, new action and some tests
2014-02-07 13:53:36 +11:00
Will Marshall
1ca9a86042
Getting in a spec asserting that percentage-based fees are applied
2014-02-07 11:09:47 +11:00
Will Marshall
202f95a8fc
Fix for broken percentage Enterprise Fees in place, no test yet
2014-02-07 11:09:47 +11:00
Will Marshall
b1118735ec
One CSS change, adding a test for le price adjustments
2014-02-07 11:09:47 +11:00
Rohan Mitchell
aa9b5c84d9
Fix expected variant option type name/presentation
2014-02-06 16:14:29 +11:00
Rohan Mitchell
f187041606
Do not display a space separating units and scaled values. eg. 1kg, 4 boxes
2014-02-06 14:05:26 +11:00
Rohan Mitchell
33691085bd
Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity.
2014-02-06 13:51:08 +11:00
Will Marshall
a1f75aa55e
Fixing up the top menu a bit
2014-02-06 13:49:27 +11:00
Will Marshall
ed8727708d
Improving responsiveness, hopefully
2014-02-06 13:03:40 +11:00
Rohan Mitchell
eccea9d9ff
When removing a product's option type, remove its variants' associated option values
2014-02-06 10:47:13 +11:00
Rob H
6243642cc9
Require timeago in karma config so that js tests run
2014-02-05 23:44:41 +11:00
Will Marshall
910d8e033e
Increasing space on right of product images
2014-02-05 15:10:45 +11:00
Will Marshall
f3edd15fa7
Switching to using new prices on shop page
2014-02-05 14:57:24 +11:00
Will Marshall
a3e6a6253c
Reworking table cell widths
2014-02-05 14:31:06 +11:00
Will Marshall
35c74e2bf0
Reworking shop to be more responsive
2014-02-05 14:26:41 +11:00
Rohan Mitchell
d0fd48456e
Variant calculates fees and its price inclusive of fees
2014-02-05 14:01:10 +11:00
Rohan Mitchell
04487da22a
Decouple OrderCycle#fees_for from LineItem
2014-02-05 13:27:17 +11:00
Will Marshall
7bdcb894cb
Adding properties to product data
2014-02-04 15:22:06 +11:00
Will Marshall
5345e7330a
Changing groups to Coming Soon
2014-02-04 15:19:36 +11:00
Will Marshall
ee8d7b1adc
Adding taxons to the product data, so we search on it
2014-02-04 15:16:16 +11:00
Will Marshall
5eff05d466
Removing the footer cruft
2014-02-04 14:50:18 +11:00
Will Marshall
e5c90e80f5
Adding sorting
2014-02-04 14:44:32 +11:00
Will Marshall
74f8fe46c6
Switching description to notes on shopping page
2014-02-04 14:14:02 +11:00
Will Marshall
2bb004ebaa
Adding notes field to products
2014-02-04 14:11:32 +11:00
Will Marshall
a2e396694b
Changing variant to unit
2014-02-04 12:02:38 +11:00
Will Marshall
a3b5a85a31
Adding list view links
2014-02-04 12:01:10 +11:00
Will Marshall
934f1eb196
Re-arranging product page into partials, redoing price display
2014-02-04 11:24:27 +11:00
Rob H
9373dcea3d
Merge branch 'master' into bom
2014-01-31 12:32:23 +08:00
Rob H
58d1bf0092
BOM: can update quantities of line_items
2014-01-31 11:57:57 +08:00
Rob H
0ac1816eb8
BOM: Add css to to allow visualisation of update status
2014-01-31 11:40:28 +08:00
Rob H
d679c7ac30
BOM dataSubmitter service changes class of relevant element based on response
2014-01-31 11:38:38 +08:00
Rob H
3beb633ed9
BOM: 'update-pending' class removed when value is init value
2014-01-31 11:24:14 +08:00
Rob H
7dbb7a5c2c
BOM: applying ofnLineItemUpdAttr directive to quantity field, tracks changes with update-pending class
2014-01-31 11:17:27 +08:00
Rob H
a5ffdbb1ba
Display quantity in field for BOM
2014-01-31 10:48:28 +08:00
Rob H
67db698a50
BOM: Add ofnLineItemUpdAttr directive to watch for changes in line_item attributes
2014-01-30 18:40:23 +08:00
Rob H
4fb06b76c7
BOM: Add switchClass service to help visualise update status
2014-01-30 18:34:48 +08:00
Rob H
b8448853ac
BOM: Add dataSubmitter service to handle updates
2014-01-30 17:09:55 +08:00
Rob H
224d91083d
BOM: Add factory to monitor changes made to line_items
2014-01-30 14:12:28 +08:00
Rob H
3bf36f0e55
Fix orders specs which fail because of new admin orders submenu
2014-01-30 14:06:32 +08:00
Rob H
1723ff22eb
Ignore confirm boxes when deleting line items in js tests
2014-01-22 18:41:03 +08:00
Will Marshall
c270473c93
Patching up the shopping spec
2014-01-22 14:36:31 +11:00
Will Marshall
803f653d39
Cleaning up handling of the page when no order cycle is selected
2014-01-22 14:25:41 +11:00
Will Marshall
7737a5da1d
Patching some regressed tests, getting in some responsive layout
2014-01-22 13:38:07 +11:00
Will Marshall
309f7d868d
Tweaking ze CSS for pretty
2014-01-22 11:58:37 +11:00
Will Marshall
60bf431008
Stripping HTML from description, since we seem to occasionally get some
2014-01-22 11:55:57 +11:00
Will Marshall
17c6321c8b
Adding some basic collapse/expand for variants in Shop
2014-01-22 11:55:57 +11:00
Rohan Mitchell
6d2f77b308
Fix report spec
2014-01-22 10:16:45 +11:00
Rohan Mitchell
5adc4f27f4
Do not display option type when showing variant options_text. This makes variant names cleaner.
2014-01-22 09:24:09 +11:00
Will Marshall
8879181a27
Adding promo image to about panel
2014-01-21 16:56:00 +11:00
Will Marshall
aec5894c70
Adding a promo image to enterprises
2014-01-21 16:32:55 +11:00
Will Marshall
8cc18e8db4
Fixing the shopping spec to conform to the new format of dates
2014-01-21 15:42:11 +11:00
Rob H
90f88d260b
Confirm deletion of line items on BOM
2014-01-19 21:59:07 +08:00
Rob H
b9a3031663
Line item delete button works
2014-01-19 21:46:11 +08:00
Rob H
1744cc9548
Orders API retrieves order number
2014-01-19 18:41:16 +08:00
Rob H
02f8917722
Add delete button to BOM page
2014-01-18 21:00:54 +08:00
Rob H
701b5aceb4
Add 'All' option to supplier and distributor filters
2014-01-18 14:26:07 +08:00
Rob H
79631ebb8e
Add distributor filter to BOM
2014-01-18 12:48:52 +08:00
Rob H
e2d9e9c4eb
BOM API collects distributor for orders
2014-01-18 11:50:36 +08:00
Rob H
3f5930032b
Add more detailed tests for output of orders API
2014-01-18 11:35:47 +08:00
Rob H
680b5c8a42
Add supplier filter to BOM
2014-01-18 11:13:32 +08:00
Rob H
6c1d149397
Add columns for quantity and max to BOM
2014-01-17 18:26:30 +08:00
Rob H
0e861d98af
Add column for variant description to BOM
2014-01-17 17:32:29 +08:00
Rob H
d6b4f8129c
Match supplier of each line item with the list fetched from server
2014-01-17 17:14:05 +08:00
Rob H
94c375ad31
WIP: changing BOM listing from orders to line items
2014-01-17 16:57:08 +08:00
Rob H
e0d03fa305
Listing more attributes of orders on BOM page
2014-01-17 15:29:08 +08:00
Rob H
00dfa62f43
Basic listing of orders on BOM page
2014-01-17 14:56:26 +08:00
Will Marshall
48854fdcf5
Adding date parsing to Angular
2014-01-17 17:13:15 +11:00
Rob H
5aa032b54c
BOM: fetchOrders sends request to API and resetOrders stores returned data
2014-01-17 14:00:02 +08:00
Rob H
c6d9bfafbc
Create shared services module for backend angularjs, rename modules
2014-01-17 13:48:28 +08:00
Will Marshall
053f2446bf
Adding a temporary note to the product page
2014-01-17 16:37:24 +11:00
Will Marshall
6e622ffb37
Changing the logo to go back to the home page
2014-01-17 16:36:28 +11:00
Will Marshall
1e88c0a6f1
Adding max quantity for group buy to ze form
2014-01-17 16:32:32 +11:00
Will Marshall
f7f4fbf503
Displaying prices better
2014-01-17 16:32:32 +11:00
Rob H
970942ff42
Add JS spec and basic initialisation code for BOM
2014-01-17 13:16:35 +08:00
Rohan Mitchell
87cf596a30
For a product with one or more on_demand variants, don't show 'On demand' at the product level
2014-01-17 16:12:07 +11:00
Rohan Mitchell
ed78cc053b
Do not update product on_hand when product has on_demand variants
2014-01-17 16:12:07 +11:00
Rohan Mitchell
4518e30849
Display infinite on_hand as read-only
2014-01-17 16:12:07 +11:00
Rohan Mitchell
ea028ddd01
Fix invalid JSON for on_demand products/variants with infinite on_hand
2014-01-17 16:12:07 +11:00
Rohan Mitchell
5e0515e6c5
Variant value expression returns a value of 1 when unit value equals the scale
2014-01-17 16:12:07 +11:00
Will Marshall
9624a3919a
Patching a bug in shop controller
2014-01-17 15:13:48 +11:00
Rob H
15c0350c29
Add product name as proxy for variant_unit_text to Order Managment API
2014-01-17 12:09:31 +08:00
Will Marshall
f5777bc7a1
Making our form on_demand and count_on_hand aware
2014-01-17 15:07:43 +11:00
Will Marshall
ef00927885
Adding a nice little JSON/controller test
2014-01-17 14:48:38 +11:00
Will Marshall
b6590000a4
Improving Product's has_stock, filtering Shop#products to in_stock products
2014-01-17 14:41:15 +11:00
Rob H
cfbf4d5bc4
Adding attributes to Order Managment API
2014-01-17 10:35:40 +08:00
Will Marshall
6f5ff0ab2c
Making a light grey option
2014-01-16 16:49:50 +11:00
Will Marshall
939b216c12
Changing text to N/A
2014-01-16 16:31:46 +11:00
Will Marshall
dac287f67a
Removing distributors and farmers, curse them
2014-01-16 16:28:10 +11:00
Will Marshall
b6d796e3bc
Getting in ze test for previous commit
2014-01-16 16:25:41 +11:00
Rob H
4e9ae7549e
Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page
2014-01-16 13:20:07 +08:00
Rob H
031414a41f
Make BPE menu tab selected
2014-01-16 13:18:28 +08:00
Will Marshall
d68551c6eb
Patching an issue with quantity fields showing for products with variants
2014-01-16 16:09:03 +11:00
Will Marshall
cbce5958e0
Removing an attr_accessible which breaks EVERYTHING
2014-01-16 15:47:38 +11:00
Will Marshall
0ddef9626e
First working image upload for enterprise logos
2014-01-16 15:47:38 +11:00
Rob H
11499178cb
Set up API for Bulk Order Management (BOM)
2014-01-16 11:56:11 +08:00
Rohan Mitchell
d861495d7d
Fix incomplete save when first setting variant_unit
2014-01-16 14:20:26 +11:00
Rohan Mitchell
1ebfea9c76
Require uglifier, should fix asset precompilation
2014-01-16 14:16:45 +11:00
Will Marshall
cdd64d438a
Adding another trivial sort to a test
2014-01-16 13:23:57 +11:00
Will Marshall
1a1057b824
Removing unhelpful gem
2014-01-16 13:04:44 +11:00
Will Marshall
35cc113aca
Fixing the checkout spec to conform to reply_to instead of from on mailer
2014-01-16 13:04:26 +11:00
Rohan Mitchell
7d224fb5ac
Update js compressor for staging as well as production
2014-01-16 12:06:00 +11:00
Rohan Mitchell
38a20e4a8c
Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4
2014-01-16 12:05:43 +11:00
Will Marshall
26a8daed0e
Patching up the order mailer to set reply_to
2014-01-16 11:39:10 +11:00
Will Marshall
d4d2482927
Adding ng-min
2014-01-16 11:24:53 +11:00
Rob H
ce5b24a777
Prevent duplicate filters being added
2014-01-15 15:50:41 +08:00
Rob H
8146301b2f
Add validation to BPE advanced filter box
2014-01-15 14:35:46 +08:00
Rohan Mitchell
29235cd2cb
Merge branch 'master' into product-amount-units
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
spec/spec_helper.rb
2014-01-14 15:34:05 +11:00
Rohan Mitchell
7bbf2037e8
Add commented out option for remote debugging via poltergeist
2014-01-14 15:15:09 +11:00
Rohan Mitchell
68e5de0290
Update acceptance specs to expect unit values to be stored in base units
2014-01-14 15:14:54 +11:00
Rohan Mitchell
d0d0fc1a06
Fix intermittently failing spec - comparison of slightly differing dates
2014-01-14 11:47:56 +11:00
Rohan Mitchell
a30e46d747
Do not delete variant options_text when saving/refreshing products
2014-01-14 11:40:58 +11:00
Rohan Mitchell
9442b7b5dc
On save, scale from chosen unit to base unit (eg. mL to L)
2014-01-14 11:13:19 +11:00
Rohan Mitchell
c43b56f3f8
On load, scale from base unit to chosen unit (eg. g to kg)
2014-01-14 10:16:21 +11:00
Rohan Mitchell
22ec6aa852
Add comment
2014-01-10 15:59:38 +11:00
Rohan Mitchell
28c641a932
Remove redundant test stubs
2014-01-10 15:44:16 +11:00
Rohan Mitchell
9c28b5baae
Fix product lists not matching when saving changes to product unit+values fields
2014-01-10 15:43:45 +11:00
Rob H
aff35e5749
Remove unused toggle-column-list directive
2014-01-10 01:08:03 +08:00
Rob H
29ba0ccc97
Initialise BPE page with 'Available On' column hidden
2014-01-10 00:46:42 +08:00
Rob H
ee2da3e008
Toggle new view controls on BPE
2014-01-10 00:26:54 +08:00
Rohan Mitchell
a60c9a9cea
When variant already has a value set, remove old option value and assign a new one
2014-01-09 14:11:54 +11:00
Rohan Mitchell
c396c2a21f
Improve speed of BPE specs
2014-01-09 12:37:43 +11:00
Rohan Mitchell
420ff37562
Provide explicit ordering for intermittently failing spec
2014-01-09 12:09:50 +11:00
Rohan Mitchell
cbe46bffed
Merge branch 'bpe_paginate'
...
Conflicts:
config/ng-test.conf.js
2014-01-09 12:07:42 +11:00
Rohan Mitchell
8f479868b4
Fix js test errors - foundation not found, but not reqd for testing angular
2014-01-09 11:44:03 +11:00
Rohan Mitchell
e35eccca93
Revert 3b3815a 6c5539a 39c2803 - remove non-mangling js compression which breaks build
2014-01-09 11:18:54 +11:00
Rohan Mitchell
3b3815a09d
Require uglifier, should fix asset precompilation
2014-01-09 09:35:29 +11:00
Rohan Mitchell
6c5539a1da
Update js compressor for staging as well as production
2014-01-08 17:25:32 +11:00
Rohan Mitchell
39c2803493
Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4
2014-01-08 16:45:21 +11:00
Rohan Mitchell
a67cea3fcd
Precompile darkswarm css and js
2014-01-08 15:59:09 +11:00
Rohan Mitchell
f317f3aa7f
Precompile darkswarm css and js
2014-01-08 15:58:47 +11:00
Rob H
ac17502046
Fix test
2014-01-08 12:30:32 +08:00
Will Marshall
533a987684
Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom
2014-01-08 15:20:33 +11:00
Rohan Mitchell
c08c42b087
Fix inconsistent test fails - insignificant ordering
2014-01-08 15:11:46 +11:00
Will Marshall
e5514920c8
Fixing up the error messages in our specs
2014-01-08 15:11:23 +11:00
Will Marshall
e0c352d135
Merge branch 'master' into darkswarm
...
Conflicts:
spec/features/admin/products_spec.rb
2014-01-08 14:49:47 +11:00
Will Marshall
7838d759ee
Removing redundant functionality from the Order Populator
2014-01-08 14:45:40 +11:00
Rohan Mitchell
5f4d787d26
Fix sorting error in spec
2014-01-08 14:43:46 +11:00
Rohan Mitchell
c42d741d3d
Remove browse product specs for removed feature
2014-01-08 14:41:06 +11:00
Rohan Mitchell
4a74c2624c
Remove specs for removed features
2014-01-08 14:15:06 +11:00
Rohan Mitchell
ea3e697b73
Rename method for clarity, remove outdated specs for OrderPopulator
2014-01-08 14:14:45 +11:00
Rohan Mitchell
20ad906f7a
Fix multicart use of OrderPopulator
2014-01-08 14:13:19 +11:00
Rohan Mitchell
dd16934496
Remove redundant serializer spec, reinstate creation of order distribution charges
2014-01-08 13:22:34 +11:00
Rohan Mitchell
4f7fdd430f
Update failing controller spec - order needs distributor set
2014-01-08 11:58:53 +11:00
Rohan Mitchell
df53a14d4b
Remove specs that are no longer relevant - distribution selection on product page no longer present
2014-01-08 11:51:26 +11:00
Rohan Mitchell
eda4f241e2
Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests
2014-01-08 11:39:05 +11:00
Rohan Mitchell
30eb11ad84
Allow select_distribution to take no order_cycle
2014-01-08 11:38:21 +11:00
Rohan Mitchell
ef56574d82
Pass quantity to OrderPopulator
2014-01-08 11:37:38 +11:00
Rohan Mitchell
458f91ef91
Add feature spec helper to select distributor and order cycle
2014-01-08 11:31:44 +11:00
Rohan Mitchell
2f98888acd
Remove active model serializers gem
2014-01-08 11:31:05 +11:00
Will Marshall
5e041a6f4f
Uncommenting the old OP code
2014-01-08 10:35:27 +11:00
Rohan Mitchell
70e16433d3
Spec for reusing existing option values
2014-01-08 10:16:38 +11:00
Rohan Mitchell
2fec16af5d
Merge branch 'master' into product-amount-units
2014-01-07 16:00:06 +11:00
Will Marshall
06ab4d5384
Patching some further regression bugs
2014-01-07 15:28:11 +11:00
Rohan Mitchell
894f86350e
Fix megalitre unit specification
2014-01-07 15:17:32 +11:00
Will Marshall
936d80b2c5
Removing a redundant test: no longer show current distributor and order cycle
2014-01-07 15:16:36 +11:00
Rohan Mitchell
042e8386ab
Refactor: Extract methods to simplify
2014-01-07 15:16:36 +11:00
Will Marshall
4d03f65766
Reworking everything to use RABL
2014-01-07 15:06:47 +11:00
Rohan Mitchell
9e6fa4d22d
Add spec for small values
2014-01-07 15:02:55 +11:00
Rohan Mitchell
ebae76375f
Fix specs to work with unit_value stored in base units, scale units correctly for output
2014-01-07 14:57:30 +11:00
Rohan Mitchell
5a1249e249
When value is blank, display description only
2014-01-07 12:19:48 +11:00
Rohan Mitchell
35d0bf6219
Generate option value values and units for weight, volume and items
2014-01-07 12:07:54 +11:00
Will Marshall
32c7682da2
Removing the serializers to fix regression issues
2014-01-07 11:12:44 +11:00
Will Marshall
641b7dcdf4
Removing the image serializer, causing regression bugs
2014-01-07 11:05:10 +11:00
Will Marshall
8e0a7d9072
Pretties, fixing the email validation issue with admin authentication steps
2014-01-07 11:04:40 +11:00
Rohan Mitchell
ef6c08408b
Generate option value name - value and description
2014-01-07 10:57:58 +11:00
Rohan Mitchell
9e956ebec6
Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.
2014-01-07 10:36:19 +11:00
Rohan Mitchell
6a4c112cf2
Rename option_type_for_variant_unit to variant_unit_option_type
2014-01-07 10:31:53 +11:00
Rob H
177782fac5
Status message works when updating products with filters applied
2014-01-06 18:20:00 +08:00
Will Marshall
9677ec7159
Starting to build mixins
2014-01-06 16:27:41 +11:00
Will Marshall
1264af584c
Removing a pointless test
2014-01-06 15:56:28 +11:00
Will Marshall
dd1b3311d7
Removing all the old order populator stuff
2014-01-06 15:23:21 +11:00
Rob H
49b9b8f635
Add messages to BPE interface for cases when 0 or > 500 products are found
2014-01-05 19:17:50 +08:00
Rob H
2e56d7a551
Can remove filters from BPE
2014-01-05 17:53:32 +08:00
Rob H
fb9fd5089a
WIP: Adding a hard filter to BPE works
2014-01-05 17:04:27 +08:00
Rob H
6445275530
Basic layout changes for BPE page
2014-01-05 00:37:36 +08:00
Rob H
a6d7044dfd
WIP: Adding basic UI for applying hard filtering to BPE
2014-01-04 19:21:10 +08:00
Rob H
7ef358a476
Add basic hard filter adding js infrastructure for BPE
2014-01-04 16:44:00 +08:00
Rob H
687332d2b0
Add loading splash to BPE
2014-01-04 15:50:26 +08:00
Rob H
c6222f2180
BPE pagination works with filtering
2014-01-02 15:22:10 +08:00
Rob H
6b865aa38c
Display BPE update message correctly
2014-01-02 13:10:06 +08:00
Rob H
ef78609049
Prevent page being orphaned when changing page size in BPE
2013-12-26 19:37:21 +08:00
Rob H
2df0545819
Fix some outstanding updating issues in BPE
2013-12-23 23:09:19 +08:00
Rob H
3372f1d605
BPE page nav using page numbers
2013-12-23 17:19:38 +08:00
Rob H
ffbfbffb28
WIP: Add basic page nav controls to BPE
2013-12-23 09:22:31 +08:00
Rob H
06995bd3c6
Add controls to alter the number of products displayed for BPE
2013-12-22 17:31:27 +08:00
Rob H
530d38c7d0
Add basic pagination informaion to BPE
2013-12-22 16:58:48 +08:00
Will Marshall
49c2cc3696
Getting in the tab navigation
2013-12-20 14:23:14 +11:00
Will Marshall
0db7eae7f8
Getting images working
2013-12-20 11:49:08 +11:00
Will Marshall
751e98443f
Removing LOADS of code
2013-12-19 16:47:27 +11:00
Will Marshall
e20120b9ca
Fixing a syntax error
2013-12-19 16:05:35 +11:00
Will Marshall
985cebb44a
Massaging the form to push orders to the cart: some refactoring still required
2013-12-19 15:51:51 +11:00
Will Marshall
1048bab303
Patching up some edge cases
2013-12-19 14:20:16 +11:00
Will Marshall
87cef4edcc
Reverting previous commit
2013-12-19 12:29:21 +11:00
Will Marshall
aaa2999ee1
Dropping our override of ActionMailer
2013-12-19 11:58:21 +11:00
Will Marshall
37f8ce68fb
Adding one additional mailer test
2013-12-19 11:58:08 +11:00
Will Marshall
b5dd921a81
Our feature spec is breaking but we'll work that out
2013-12-19 10:44:47 +11:00
Will Marshall
b3a4d826b8
Dumping OrderCycle data via :javascript tags instead of ng-init, Angularising the selector stuff
2013-12-18 17:05:47 +11:00
Will Marshall
1f012dc52c
Patching up the tests to check on our serialisers
2013-12-18 16:15:23 +11:00
Will Marshall
6d124b3275
Failing tests, forcing the orders close text to change
2013-12-18 16:12:06 +11:00
Will Marshall
21d99c8e56
Directing our form to the order populator
2013-12-18 15:17:08 +11:00
Will Marshall
4b7605212e
Adding text trunctation in Angular
2013-12-18 14:45:32 +11:00
Will Marshall
adbfdafff3
Lots of styling improvements
2013-12-18 13:13:58 +11:00
Will Marshall
a3dfe1b147
Working on the HTML structure, variants etc
2013-12-18 12:26:34 +11:00
Will Marshall
e23b33ab48
Adding variants display
2013-12-18 11:35:25 +11:00
Will Marshall
3ed8dc5a7d
Tiny typography change
2013-12-17 15:56:36 +11:00
Will Marshall
f146610a93
Fixing a recursion bug in Angular
2013-12-17 15:52:21 +11:00
Will Marshall
7ea9cf6862
Adding price to serializer
2013-12-17 15:45:06 +11:00
Rohan Mitchell
9f47ff64fa
Update spec now that bulk product edit is the default product edit view
2013-12-17 15:29:25 +11:00
Will Marshall
67fcf0f534
Fixing up the feature specs
2013-12-17 15:26:49 +11:00
Rohan Mitchell
3c95993975
Remove order sensitivity in specs
2013-12-17 15:25:17 +11:00
Will Marshall
c4c5f3a8c7
Merging from master
2013-12-17 14:18:21 +11:00
Will Marshall
ece46811f9
Adding serializers also
2013-12-17 14:04:36 +11:00
Will Marshall
843a1133ef
Moving to use custom serializers for ze JSON API
2013-12-17 13:48:08 +11:00
Rohan Mitchell
e443495a7e
Remove reference to deleted stylesheet
2013-12-17 12:48:44 +11:00
Rohan Mitchell
f1f3d7a99c
Remove duplicate migration
2013-12-13 16:01:36 +11:00
Rohan Mitchell
5c744c7295
Move enterprises_distributor_info_rich_text_feature styles into central files
2013-12-13 16:01:36 +11:00
Will Marshall
222ed20361
Defaulting to bulk products
2013-12-13 15:57:32 +11:00
Will Marshall
63349c7c9a
Fixing some breaking bugs in the refactored mailer
2013-12-13 15:40:23 +11:00
Will Marshall
f6af9e78ac
Adding destroy ability to enterprise users
2013-12-13 15:40:23 +11:00
Will Marshall
92b3d496a4
Fixing the bugherd script to use the production one
2013-12-13 15:40:23 +11:00
Will Marshall
12743850b4
Removing a chili, refactoring order mailer
2013-12-13 15:40:22 +11:00
Rohan Mitchell
124b6df75d
Show undated order cycles on index page
2013-12-13 14:51:43 +11:00
Rohan Mitchell
1084862139
When product variant unit is changed, remove related option values from variants
2013-12-13 12:08:51 +11:00
Will Marshall
6e36142809
Making some changes to the data on the products inventory page
2013-12-13 11:39:45 +11:00
Rohan Mitchell
60a3e06c5b
Reformat
2013-12-13 11:10:08 +11:00
Rohan Mitchell
f2269654ff
Set option type on product when variant unit changed
2013-12-13 11:07:57 +11:00
Will Marshall
e98031e581
Fixing some minor report bugs
2013-12-13 10:12:41 +11:00
Will Marshall
d5081e4cc5
Working on the pretties
2013-12-13 09:19:54 +11:00
Rohan Mitchell
03aa5604e5
Reorder columns on BPE
2013-12-12 10:52:17 +11:00
Rohan Mitchell
a67c7b808d
Do not set unit value or description on variant when unpacked field is undefined
2013-12-12 10:50:03 +11:00
Will Marshall
36694822db
Starting to prettify
2013-12-12 10:28:43 +11:00
Rohan Mitchell
42d3947861
Set unit value and description on variants
2013-12-12 10:14:05 +11:00
Will Marshall
8f41078c0c
Reworking our bindings so everything stacks on objects and automagically updates
2013-12-11 15:39:50 +11:00
Will Marshall
bc4f472523
Fixing up the tests with some refactoring
2013-12-11 15:33:57 +11:00
Will Marshall
71a5d84a1d
Filtering the products to the current order cycle
2013-12-11 15:06:07 +11:00
Will Marshall
3903173848
Working reloading of products, changing order cycles, sticky state
2013-12-11 13:36:12 +11:00
Will Marshall
04d8949177
Tweaks to the JS, redirection on the controller
2013-12-11 12:53:50 +11:00
Will Marshall
44fe304efb
Building out and testing our Product and OrderCycle Angular stuff
2013-12-11 12:42:33 +11:00
Will Marshall
4db8f755bf
Getting an order cycle update function in place like a boss
2013-12-11 12:42:02 +11:00
Rohan Mitchell
33f06f5eff
Display unit value and description for variants in BPE
2013-12-06 15:57:37 +11:00
Will Marshall
63dfa0b696
Getting the test framework set up for Angular, setting up a products fetch stub
2013-12-06 15:24:42 +11:00
Rohan Mitchell
385a80a305
Revert "Can set variant_unit_name when unit type is not items" - this applies to a different field.
...
This reverts commit 8f6f37355c .
2013-12-06 14:38:46 +11:00
Rohan Mitchell
3013870bd6
Merge branch 'master' into product-amount-units
...
Conflicts:
config/ng-test.conf.js
2013-12-06 14:33:59 +11:00
Rohan Mitchell
6956eb3f94
Basic styling for variant unit fields on BPE
2013-12-06 14:30:38 +11:00
Rohan Mitchell
8f6f37355c
Can set variant_unit_name when unit type is not items
2013-12-06 14:25:19 +11:00
Rohan Mitchell
5e086af27a
Update product variant_unit_name when variant unit is items
2013-12-06 13:16:33 +11:00
Rohan Mitchell
4e1a1825e6
Fix incorrect prefix on track-product
2013-12-06 13:14:55 +11:00
Rohan Mitchell
b21263e1c0
Display text field for variant_unit_name
2013-12-06 12:06:16 +11:00
Rohan Mitchell
e70513b06c
Remove off-canvas class for landing page, allowing it to scroll
2013-12-06 11:47:07 +11:00
Rohan Mitchell
3adeed1fa0
Update attr name
2013-12-06 11:11:19 +11:00
Will Marshall
b806947e7b
Merge branch 'master' into darkswarm
2013-12-06 11:08:17 +11:00
Rohan Mitchell
fdc98ba24c
Convert Karma config file to v0.10 compatible format
...
Conflicts:
config/ng-test.conf.js
2013-12-06 11:07:32 +11:00
Rohan Mitchell
62ca121db2
Rename directives to avoid using the ng namespace, which is reserved for angular core
2013-12-06 10:49:06 +11:00
Rohan Mitchell
a4edacc138
Change to double quotes for spec names
2013-12-06 10:41:28 +11:00
Rohan Mitchell
d9d6d48ede
Centralise ctrl calls
2013-12-06 10:14:38 +11:00
Will Marshall
3670d68265
Correctly failing tests forcing us to build out OrderCycle switching in Angular
2013-12-05 16:48:29 +11:00
Will Marshall
102cb62b60
Starting to build out the Angular.js app
2013-12-05 16:31:22 +11:00
Will Marshall
3cda12b8dd
Refactoring the order cycle partials
2013-12-05 16:31:12 +11:00
Will Marshall
165513fdea
Adding some feature tests for the basic products page
2013-12-05 16:30:59 +11:00
Will Marshall
3f4f5143ff
Refactoring the order cycle partials
2013-12-05 16:30:39 +11:00
Rohan Mitchell
84fe6706a2
Make 'Items' option appear in variant_unit field on BPE
2013-12-05 15:50:08 +11:00
Rohan Mitchell
8af7c57a88
Pack variant_unit fields back into products and dirtyProducts. These fields can now round-trip to the server.
2013-12-05 15:16:52 +11:00
Rohan Mitchell
f07fb8d533
Make variant unit fields attr_accessible
2013-12-05 15:16:52 +11:00
Rohan Mitchell
e3043cc6ae
Rename prepareProductsForSubmit to submitProducts
2013-12-05 15:16:52 +11:00
Rohan Mitchell
fefea54375
Do not include variant_unit_with_scale in product update check. When saving products, save variant_unit and variant_unit_scale.
2013-12-05 15:16:52 +11:00
Rohan Mitchell
2115e33189
Use == instead of is
2013-12-05 15:16:52 +11:00
Rohan Mitchell
0a07f38f15
Load and display variant_unit on BPE page
2013-12-05 15:16:52 +11:00
Rohan Mitchell
2a989652cb
Use ||=
2013-12-05 15:16:52 +11:00
Rohan Mitchell
d552e84302
Tweak formatting
2013-12-05 15:16:52 +11:00
Rohan Mitchell
21154a9455
Convert bulk product update spec to coffeescript
2013-12-05 15:16:52 +11:00
Rohan Mitchell
cee54b4785
Convert Karma config file to v0.10 compatible format
2013-12-05 15:16:52 +11:00
Rohan Mitchell
a8668e24e3
Finish converting bulk product update to coffeescript
2013-12-05 15:16:51 +11:00
Rohan Mitchell
634dd52a80
WIP: Convert bulk product update to coffeescript. 3 tests failing.
2013-12-05 15:16:51 +11:00
Rohan Mitchell
1b63546a9e
Master variants are valid without unit value or description
2013-12-05 15:16:51 +11:00
Rohan Mitchell
4c72170742
Remove unnecessary require
2013-12-05 15:16:51 +11:00
Rohan Mitchell
0bae3e58b8
Add product units and amount fields to product and variant models, add validations
2013-12-05 15:16:51 +11:00
Will Marshall
7e9f389900
Getting the order cycles dropdown rendering correctly
2013-12-05 15:15:15 +11:00
Will Marshall
ec72e9137a
We can now hit the index page
2013-12-05 15:07:46 +11:00
Will Marshall
4543e08872
Renaming everything to Shop
2013-12-05 13:40:05 +11:00
Will Marshall
f525b7aea1
Adding the distributors controller
2013-12-04 15:58:25 +11:00
Will Marshall
720d66b379
Merge branch 'master' into ui_setup
2013-12-04 14:28:20 +11:00
Will Marshall
578651ddae
forcing SSL in staging
2013-12-04 14:26:22 +11:00
Will Marshall
9876a5f27b
Merge branch 'master' into ui_setup
2013-12-04 14:13:06 +11:00
Will Marshall
0032a806b5
Further work on Darkswarm
2013-12-04 14:12:13 +11:00
Will Marshall
987ba1a81a
Adding a monkeypatch to spree to always allow SSL
2013-12-04 14:08:08 +11:00
Will Marshall
ff003d8931
disabling SSL :/
2013-12-04 13:42:35 +11:00
Will Marshall
f0e847a9f1
Merge branch 'master' into ui_setup
2013-12-04 13:09:48 +11:00
Will Marshall
9efd7c2d69
Getting the darkswarm build flow up and running. Like a boss
2013-12-04 13:09:30 +11:00
Will Marshall
c2d3e8bcec
Forcing staging to SSL
2013-12-04 13:08:28 +11:00
Will Marshall
3d019bdcd5
Starting to partialise things
2013-11-29 16:52:14 +11:00
Will Marshall
175cd86976
Adding darkswarm basics
2013-11-29 16:38:14 +11:00
Will Marshall
a8a12d6d04
Adding some magical guard unicorn sparkles
2013-11-29 16:11:56 +11:00
Will Marshall
e574185c95
Fixing an ordering issue in the order cycle spec
2013-11-29 14:48:06 +11:00
Will Marshall
0ac9bfd898
Moving our fix for the broken Spree function into our own JS
2013-11-29 14:24:56 +11:00
Will Marshall
0cfc0efe32
Overriding the broken _destroy partial so failure to destroy is shown as intended
2013-11-29 12:32:47 +11:00
Rohan Mitchell
6608b6e1ad
Remove some angular testing crud, integrate with regular rails config and script dirs
2013-11-29 11:13:41 +11:00
Rohan Mitchell
29308dca76
Enable order cycles by default
2013-11-29 10:49:33 +11:00
Will Marshall
33b23dd265
Sorting the bitching product report like a boss
2013-11-28 17:06:06 +11:00
Will Marshall
13e991d02d
Changing favicon
2013-11-28 16:52:54 +11:00
Will Marshall
7784a6ef44
Adding a default value of NOW to available_on on Products
2013-11-28 16:41:46 +11:00
Will Marshall
dec33ebda4
Fixing the HTML in the admin section
2013-11-28 16:13:13 +11:00
Will Marshall
69459847ca
Fixing some responsiveness issues on the home page
2013-11-28 15:42:00 +11:00
Will Marshall
acdbbb153d
Fixing up the landing page spec to cover the new login text
2013-11-28 15:24:38 +11:00
Will Marshall
7742fdc27a
Adding a better homepage login function
2013-11-28 15:01:57 +11:00
Will Marshall
7bc754a598
Adding filtering to the products page
2013-11-28 13:44:21 +11:00
Will Marshall
d39cb74d06
Merge branch 'customers'
2013-11-22 16:55:11 +11:00
Will Marshall
27f99d1383
Working version of Customers reports without filters
2013-11-22 16:53:57 +11:00
Will Marshall
fbe0e2cc29
Basic plumbing for the Customers in place
2013-11-22 16:22:44 +11:00
Will Marshall
51ea6fcd67
Starting on the Customers Report
2013-11-22 14:57:11 +11:00
Will Marshall
b3bf3a8378
Adding the plumbing for Customers reports, and one tiny refactor to products
2013-11-22 14:56:57 +11:00
Rohan Mitchell
4898460132
Fix failing spec with table reorder, lambda-fy scopes that use time
2013-11-22 14:00:04 +11:00
Rohan Mitchell
94c33e5f45
Colour order cycle rows based on their status
2013-11-22 11:31:04 +11:00
Rohan Mitchell
459b2c1050
Add #upcoming? and #open? to OrderCycle
2013-11-22 11:15:12 +11:00
Rohan Mitchell
3a2394675f
Rename OrderCycle#expired? to #closed?
2013-11-22 11:08:42 +11:00
Rohan Mitchell
5ad63d08f3
Add some more open/close time scopes to order cycles
2013-11-22 10:57:33 +11:00
Rohan Mitchell
f75879bec1
Put order cycle variants in a tooltip
2013-11-22 10:03:49 +11:00
Will Marshall
5e170a843e
Forcing a rebuild on Jenkins
2013-11-21 17:22:47 +11:00
Will Marshall
c695bafe69
Reworking the way the Reports works so we have more granular control over what shows
2013-11-21 16:45:59 +11:00
Will Marshall
beb6110bc3
Fixing up a bug in the aggregate filtering
2013-11-21 15:04:33 +11:00
Rohan Mitchell
b101a37dad
Rearrange columns
2013-11-21 14:42:28 +11:00
Rohan Mitchell
dfcf567f26
Sort payment methods by name
2013-11-21 14:42:28 +11:00
Will Marshall
612a80ec15
A little refactoring, some comment removal
2013-11-21 14:28:23 +11:00
Will Marshall
f642d6532a
Removing reundant Group Buys spec now we've removed Group Buys
2013-11-21 14:06:46 +11:00
Will Marshall
d703e1836f
Working build of P&I report
2013-11-21 14:06:24 +11:00
Will Marshall
e853c1275e
Working filters for Product&Inventory Report
2013-11-21 11:25:37 +11:00
Will Marshall
ca16314535
Working scopes for child variant and master variants
2013-11-20 14:11:22 +11:00
Will Marshall
84346c7fbd
Starting specing P&I Report
2013-11-20 13:59:02 +11:00
Will Marshall
6a11b2685f
Controller plumbing for Product & Inventory report
2013-11-20 13:58:01 +11:00
Will Marshall
5772fa9589
Boilerplate for the new Product and Inventory report, sans any functionality
2013-11-20 10:34:18 +11:00
Rohan Mitchell
306eaab262
Remove uservoice
2013-11-15 16:31:46 +11:00
Rohan Mitchell
7a8bd16083
On enterprise page, do not display products outside of the outgoing exchange
2013-11-15 15:08:45 +11:00
Rohan Mitchell
59935619e3
Rename OrderCycle#distributed_variants_by to variants_distributed_by
2013-11-15 14:34:05 +11:00
Rohan Mitchell
52b6c33aaa
When converting an exchange to a hash for comparison, ensure id lists are sorted - ordering issues should not indicate inequality
2013-11-15 12:09:26 +11:00
Rohan Mitchell
d73af509e0
When removing exchanges from an order cycle, compare by id only. Avoids erroneously removing exchanges where another attr has changed in an unimportant way.
2013-11-15 12:09:26 +11:00
Rohan Mitchell
8980284390
Reorder OC admin index table columns
2013-11-15 12:09:26 +11:00
Rohan Mitchell
daee827af6
Generalise db remote backup script, add restore script
2013-11-15 12:09:26 +11:00
Will Marshall
2ce687fc79
Adding variant update permissions to Enterprise users
2013-11-14 11:53:14 +11:00
Will Marshall
9097246301
Removing uservoice
2013-11-14 11:07:58 +11:00
Will Marshall
27b892851a
Enabling bugherd in Production
2013-11-14 11:02:20 +11:00
Will Marshall
281220c490
Updating a few gems
2013-11-13 16:25:06 +11:00
Will Marshall
a4f2ea771d
Fixing the bulk update spec
2013-11-13 16:24:09 +11:00
Rohan Mitchell
27b8c4508f
Split product distribution editing into its own admin page
2013-11-13 15:22:17 +11:00
Will Marshall
713742f016
Adding back in an important ID
2013-11-08 17:16:45 +11:00
Will Marshall
b7104add1c
Patching up the footer, partialising it
2013-11-08 16:37:02 +11:00
Will Marshall
b227be4a62
Adding an override to suppress the products display unless we actually have an order_cycle in play
2013-11-08 16:04:31 +11:00
Rohan Mitchell
283401d6fe
Fix checkout confirmation page blank (access denied) when checking out anonymously - BugHerd #139
2013-11-08 15:27:32 +11:00
Will Marshall
317b2f1ced
Helperizing some of the order cycles stuff
2013-11-08 15:19:27 +11:00
Will Marshall
b1d064c964
Adding some fancy new partials for the order cycle selection logic
2013-11-08 11:27:13 +11:00
Will Marshall
6582ed0753
Removing an extraneous check on the order cycle from line 4, partialising
2013-11-08 11:26:36 +11:00
Rohan Mitchell
71d6e51078
Put distributors column second, no need to explicitly set column widths, so remove this
2013-11-07 16:25:43 +11:00
Rohan Mitchell
48f18a93de
Order shipping methods by name, not distributor
2013-11-07 16:25:43 +11:00
Rohan Mitchell
0755b515d1
Only show shipping methods that enterprise user has access to
2013-11-07 16:25:43 +11:00
Will Marshall
a526439643
Moving the orders controller spec into the right place
2013-11-07 15:13:07 +11:00
Will Marshall
b7c7730278
Patching a bug in which we'd 404 if deleting items from a cart twice in parallel
2013-11-07 15:12:28 +11:00
Will Marshall
f0d335a454
Fixing up the failing spec for distributor changes, reworking a method to SharedHelper
2013-11-07 11:47:05 +11:00
Will Marshall
e33ff15151
Adding a small override to unbreak the New Product link
2013-11-06 16:28:51 +11:00
Rohan Mitchell
04387aa6b7
Scope time since last oc expired to distributor
2013-11-06 16:17:36 +11:00
Will Marshall
d95394f70d
Adding tooltips to the footer link
2013-11-06 15:56:00 +11:00
Will Marshall
406f8033fe
Partialising the _distributor render
2013-11-06 15:36:39 +11:00
Will Marshall
f9a4718bdd
Reworking the homepage styles to work on mobile as well as screen
2013-11-06 14:14:55 +11:00
Will Marshall
0784642517
Removing the copyright from the footer
2013-11-06 13:40:05 +11:00
Will Marshall
59b6badcd6
Small text change on the order confirmation screen
2013-11-06 13:28:54 +11:00
Will Marshall
3c37696882
Adding specs and implementation: moving current distributor to new empty order after checkout
2013-11-06 12:35:22 +11:00
Rohan Mitchell
72efb2096b
Remove comment - everything makes sense now
2013-11-06 11:26:10 +11:00
Will Marshall
bef64e5967
Making sure the final row has a bottom border
2013-11-06 11:18:34 +11:00
Will Marshall
91abf4fab1
Reworking the temp homepage to use the Foundation styles more cleverly
2013-11-06 11:16:29 +11:00
Will Marshall
263195c8b9
Merging
2013-11-06 10:59:56 +11:00
Will Marshall
71af58239e
Making the 'next order cycle' text big and black
2013-11-06 10:58:09 +11:00
Rohan Mitchell
fd43227921
Explicitly precompile style needed
2013-11-06 10:42:39 +11:00
Rohan Mitchell
bacd8401b4
Compile all admin css files for manual inclusion (fixes BugHerd #126 )
2013-11-06 10:18:45 +11:00
Rohan Mitchell
6e0dfbd88b
Make order cycle admin open and close time columns wider
2013-11-01 16:50:48 +11:00
Will Marshall
7d21dd053a
Merging
2013-11-01 16:50:28 +11:00
Will Marshall
8f27c7be80
Fixing a clearing bug on the home page
2013-11-01 16:49:28 +11:00
Rohan Mitchell
6aad840d05
Change inaccurate wording - this lists order cycles by closing date, not availability date
2013-11-01 16:37:49 +11:00
Rohan Mitchell
25b0306a93
Ensure css is precompiled, reformat configs
2013-11-01 16:22:54 +11:00
Will Marshall
9f150c8d87
Adding a small display on the distributor page indicating when the next order cycle is, if any - BugHerd#127
2013-11-01 16:12:31 +11:00
Will Marshall
37b81af91c
Adding myself to the Readme as a contributor
2013-11-01 14:49:58 +11:00
Will Marshall
b8fcfbd72b
Test and implementation: dropping inclusion of product_distributions from active Distributors on front page - BugHerd#125
2013-11-01 14:48:23 +11:00
Will Marshall
26f2d27d64
Updating therubyracer to fix mac compatibility with libv8
2013-11-01 14:46:41 +11:00
Rohan Mitchell
3d07d68637
Order landing page distributors by name
2013-10-31 16:28:04 +11:00
Rohan Mitchell
34638c0bf9
Remove pry from spec
2013-10-31 16:27:13 +11:00
Rohan Mitchell
094485bc2d
Sort enterprises by name, display direct-from-the-farm links separately at top
2013-10-31 15:52:22 +11:00
Rohan Mitchell
eb997c94a2
Mark inactive distributors on supplier distributors list
2013-10-31 14:59:47 +11:00
Rohan Mitchell
758676c1ea
When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products
2013-10-31 14:49:26 +11:00
Rohan Mitchell
217f1b58ad
Fix spec broken by 8595839
2013-10-31 13:49:57 +11:00
Rohan Mitchell
a3b96070d5
Use helper instead of manually creating a subject
2013-10-31 11:40:28 +11:00
Rohan Mitchell
859583992e
Hide distributors from product details page
2013-10-31 10:25:57 +11:00
Rohan Mitchell
2533e52189
After saving, maintain filter on enterprise fees by enterprise
2013-10-30 17:36:54 +11:00
Rohan Mitchell
5386fa72cc
Enterprise fees admin page for a specific enterprise auto-selects that enterprise for new fees and only allows selection of managed enterprises
2013-10-30 17:00:05 +11:00
Rohan Mitchell
32889715f0
Grey out hubs that have no products available for distribution and are not in an order cycle
2013-10-30 16:09:18 +11:00
Rohan Mitchell
fc8c82d5d2
Display enterprise groups on home page by position
2013-10-30 14:48:04 +11:00
Rohan Mitchell
647e1d196c
Position enterprise groups
2013-10-30 14:46:49 +11:00
Rohan Mitchell
2fe23c53ed
Rename region to group
2013-10-30 13:57:33 +11:00
Rohan Mitchell
521ed565b4
Modify specs to create enterprise groups where needed
2013-10-30 13:56:10 +11:00
Rohan Mitchell
57a450b0aa
Load landing page distributors from enterprise groups instead of yaml file
2013-10-30 13:55:47 +11:00
Rohan Mitchell
7f6f725e02
Find enterprise groups on the front page
2013-10-30 13:54:11 +11:00
Rohan Mitchell
2d80490d41
Update group membership for enterprise
2013-10-30 11:27:39 +11:00
Rohan Mitchell
49b36d0670
Delete enterprise group
2013-10-30 10:42:32 +11:00
Rohan Mitchell
b8457b2b0f
Edit enterprise group
2013-10-30 10:42:32 +11:00
Rohan Mitchell
be7e76920d
Create new enterprise group
2013-10-30 10:42:32 +11:00
Rohan Mitchell
a6fa73ec13
List enterprise groups
2013-10-30 10:42:32 +11:00
Rohan Mitchell
e78815c2d3
Create models for EnterpriseGroups
2013-10-30 10:42:32 +11:00
Rohan Mitchell
8d0f192ca7
Update states to match
2013-10-30 10:42:23 +11:00
Rohan Mitchell
6161114750
Standardise on Australia having ID 12, as staging and prod servers do
2013-10-30 10:34:29 +11:00
Rohan Mitchell
cbdd8a0091
Fix enterprise admin form style, which was being clobbered by CMS styles
2013-10-30 09:56:44 +11:00
Rohan Mitchell
5c9c96e174
Do not error if order cycle loads before enterprises
2013-10-24 13:40:27 +11:00
Rohan Mitchell
e265b406d6
Generalise script to work with staging servers, too
2013-10-24 13:30:21 +11:00
Rohan Mitchell
767bda3093
Redirect /products to enterprise path, since this page did not have correct product filtering
2013-10-24 11:33:03 +11:00
Rohan Mitchell
0d1dd361d6
Do not display links to enterprise payment methods and shipping methods when enterprise is a supplier only
2013-10-24 10:46:03 +11:00
Rohan Mitchell
fb22b5e2b7
When there are no order cycles open, display an 'orders closed' message
2013-10-24 10:32:30 +11:00
Rohan Mitchell
e3307623dd
When order cycle expires, clear cart and display a message (from BaseController)
2013-10-23 17:16:07 +11:00
Rohan Mitchell
aec21b1a54
Add script to backup prod server to localhost
2013-10-23 17:14:53 +11:00
Rohan Mitchell
12061fd485
Order cycle admin does not allow save until page is loaded
2013-10-23 14:59:50 +11:00
Rohan Mitchell
763dab9efc
Fix country init for Jenkins
2013-10-23 10:41:50 +11:00
Rohan Mitchell
bd6997f345
Update Eaterprises -> OFF in README
2013-10-23 10:41:39 +11:00
Rohan Mitchell
0c5312f893
Update gem repo URLs
2013-10-23 10:41:26 +11:00
Rohan Mitchell
101510f2f4
Fix error when setting up a fresh db
2013-10-23 09:25:26 +11:00
Rohan Mitchell
b8320a9bb6
Rename some directives and internal login details
2013-10-19 09:45:38 +11:00
Rohan Mitchell
f7c431be3c
Rename database names and user name
2013-10-19 09:43:10 +11:00
Rohan Mitchell
761bafe375
Rename text labeling from open food web to open food network
2013-10-18 17:46:05 +11:00
Rohan Mitchell
34607ff556
Rename misc items from openfoodweb to openfoodnetwork
2013-10-18 17:43:59 +11:00
Rohan Mitchell
89f93cae77
Rename namespaced includes from open_food_web to open_food_network
2013-10-18 17:43:18 +11:00
Rohan Mitchell
e47fa0edfd
Rename application from Openfoodweb to Openfoodnetwork
2013-10-18 17:32:22 +11:00
Rohan Mitchell
57f7d489ff
Rename OpenFoodWeb namespace to OpenFoodNetwork
2013-10-18 17:29:55 +11:00
Rohan Mitchell
8e269353a8
Rename all open_food_web dirs to open_food_network
2013-10-18 17:19:47 +11:00
Rohan Mitchell
39c60a84d6
Rename files from OFW to OFN convention
2013-10-18 17:15:21 +11:00
Rohan Mitchell
8ccad4b53a
Return an error code when bulk product edit save fails
2013-10-18 16:23:25 +11:00
Rohan Mitchell
bd112c64b0
Fix edit enterprise link to point to edit page, fix spec breakages
2013-10-18 15:39:58 +11:00
Rohan Mitchell
ea17e475a6
When viewing enterprise fees, only show those for the enterprise I select
2013-10-18 14:44:01 +11:00
Rohan Mitchell
91f14dcd4c
Enterprise manager can create/edit enterprise fees
2013-10-18 13:56:22 +11:00
Rohan Mitchell
3b5e6f5742
When viewing shipping methods, only show those for the distributor I select
2013-10-18 10:01:11 +11:00
Rohan Mitchell
c07c52085a
Enterprise user can view and create shipping methods
2013-10-18 09:35:53 +11:00
Rohan Mitchell
e6041aaf2f
Enterprise user can view, create and edit payment methods
2013-10-18 09:09:53 +11:00
Rohan Mitchell
05932a69cd
Adjust checkout spec for shipping method HABTM distributors
2013-10-17 12:30:26 +11:00
Rohan Mitchell
358ca25f31
Admin can assign multiple distributors to a shipping method
2013-10-17 11:16:26 +11:00
Rohan Mitchell
93cb845ee2
DB and model changes to make ShippingMethod distributor habtm
2013-10-17 11:15:43 +11:00
Rohan Mitchell
de8d7bd66e
Clean up payment methods form
2013-10-17 11:08:25 +11:00
Rohan Mitchell
8654f23a19
Move spree model decorator specs into their own dir to mirror model dir layout
2013-10-17 09:53:54 +11:00
Rohan Mitchell
d480e96d7a
Do not add an extra product which confuses other tests
2013-10-16 17:38:39 +11:00
Rohan Mitchell
e29497c5b4
Enterprise users can bulk edit inactive products
2013-10-16 16:57:20 +11:00
Rohan Mitchell
751801653e
Bulk product update with >25 products succeeds
2013-10-16 14:36:22 +11:00
Rohan Mitchell
a898d6d831
Add script to pull down and mirror the prod database
2013-10-16 12:04:29 +11:00
Rohan Mitchell
631bc631fb
Do not show order cycle debug info in production
2013-10-16 10:39:32 +11:00
Rohan Mitchell
a6877c6981
Only render calculator HTML in enterprise fee JSON if explicitly requested. Improves load time of order cycles page.
2013-10-16 10:37:09 +11:00
Rohan Mitchell
4b7fc8b5e4
In production, redirect to hostname with the SSL certificate
2013-10-14 10:44:14 +11:00
Rohan Mitchell
bf02dd0caa
Set countries and states in test to mirror id configuration provided by seed
2013-10-11 15:11:50 +11:00
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
c5228c9ad2
Fix home controller for oc hit by global before_filter
2013-09-30 17:22:55 +10: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
8353413c4a
Fix spec fail
2013-09-30 15:13:02 +10:00
Rohan Mitchell
935229fa09
On order show / confirmation page, show correct pickup time for order cycle pickup
2013-09-30 14:53:28 +10:00
Rohan Mitchell
57aa10a6f6
Fix specs for time zone change
2013-09-30 11:40:05 +10:00
Rohan Mitchell
54d95d304f
Convert to Melbourne time zone
2013-09-30 11:25:26 +10:00
Rohan Mitchell
f5b56617a0
As an enterprise user, when I create an enterprise, I should have management permission for it
2013-09-30 11:10:20 +10:00
Rohan Mitchell
1d4198d402
Removing a supplier exchange removes variants from distribution
2013-09-30 09:46:39 +10:00
Rohan Mitchell
32204076bd
Update js specs for pagination fix
2013-09-30 09:18:49 +10:00
Rohan Mitchell
208ffb3317
Fix commented-out order cycle specs
2013-09-27 16:02:06 +10:00
Rohan Mitchell
01036ec730
Add LineItem#supplied_by scope, fixes orders and fulfillment report supplier filtering
2013-09-27 14:11:12 +10:00
Rohan Mitchell
dac49d1044
Order cycle-aware pickup time
2013-09-27 11:17:24 +10:00
Rohan Mitchell
68fe20c37a
Add scope: Exchange.with_product
2013-09-23 17:39:16 +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
44aac294e0
Merge branch 'issue14'
2013-09-23 15:39:13 +10:00
Rohan Mitchell
19349c805f
Destroy supplied products when a supplier is destroyed
2013-09-23 14:58:26 +10:00
Rohan Mitchell
450a1e49c2
Do not 500 when add to cart fails
2013-09-23 14:15:53 +10:00
Rohan Mitchell
741a81a427
Fix spec fails - do not redirect on Products#show when distributor not set
2013-09-23 14:00:33 +10:00
Rohan Mitchell
072ce67b78
Redirect if distributor not chosen
2013-09-23 13:39:13 +10:00
Rohan Mitchell
000b13782e
Remove taxon crumbs, since taxon view is not yet supported and produces errors
2013-09-23 11:06:02 +10:00
Rohan Mitchell
803594b4d7
Confirm change hub when it would empty cart
2013-09-23 10:07:25 +10:00
Rohan Mitchell
767478a0ee
Add link to change hub
2013-09-23 09:17:17 +10:00
Rob H
8831dfc660
Fix #42
2013-09-20 14:28:46 +05:45
Rob H
08eb865469
Increase pagination size for products in BPE, resolves #14
2013-09-20 13:25:07 +05:45
Rohan Mitchell
9811851e29
Comment out order cycles debug styling that breaks tests
2013-09-20 13:08:54 +10:00
Rohan Mitchell
d100d12ebe
When a variant is removed from supply to an order cycle, remove it from distribution also
2013-09-20 11:11:59 +10:00
Rohan Mitchell
00fe10e847
Reposition order cycle admin debug info
2013-09-20 09:29:26 +10:00
Rohan Mitchell
ab052b771b
Ignore newrelic config
2013-09-20 09:26:14 +10:00
Rohan Mitchell
4956a4e384
Only geocode addresses associated with enterprises. Makes Checkout#update much faster.
2013-09-19 16:56:48 +10:00
David Cook
0183b0f2c1
Fix bulk update of order cycles for enterprise users
2013-09-19 15:48:39 +10:00
David Cook
2df2096d74
Sort payment and shipping methods by distributor name
2013-09-19 15:21:14 +10:00
David Cook
2e13abf933
Show only orders I am distributing
2013-09-19 15:21:14 +10:00
Rohan Mitchell
c9e543b25a
Update delivery page of checkout, change shipping to delivery
2013-09-19 13:40:49 +10:00
David Cook
e4127358c3
Rearrange admin payment methods table (BH#73)
2013-09-19 12:12:50 +10:00
David Cook
402ed01207
Refactor/cleanup
2013-09-19 12:12:50 +10:00
Rohan Mitchell
da9e756d9f
Fix migration for envs without distributors
2013-09-19 11:32:00 +10:00
Rohan Mitchell
08941ae22b
Data integrity
2013-09-19 11:22:55 +10:00
Rohan Mitchell
f06f4702ed
Update newrelic agent
2013-09-19 09:35:13 +10:00
Rohan Mitchell
136ec7d9d3
Remove heroku newrelic config
2013-09-19 09:34:57 +10:00
Rohan Mitchell
dc9206ccf6
Re-arrange top nav area
2013-09-18 16:27:18 +10:00
David Cook
b544c3a4f9
Add distributor column to admin shipping methods and payment methods pages
2013-09-18 13:48:50 +10:00
Rohan Mitchell
c30b8554da
Pin deface to working version, update spree_paypal_express with state capitalisation fix
2013-09-18 12:39:20 +10:00
Rohan Mitchell
633399bbfb
Rename 'Inner Melbourne' region to 'Eaterprises'
2013-09-18 12:39:20 +10:00
David Cook
42a31ccd74
Show all relevant suppliers and distributors in report drop-down
2013-09-18 12:34:44 +10:00
David Cook
ad4301df90
Add supplier selection to Orders & Fulfillment Report
2013-09-18 12:34:43 +10:00
Rohan Mitchell
fb9adf051e
Update bugsnag. I can haz custom exception metadata?
2013-09-18 11:42:31 +10:00
David Cook
4c2d6b38ea
Ensure 'No Order Cycle' remains selected after clicking 'Search'
2013-09-18 09:57:03 +10:00
David Cook
b34d940457
Renamed report column to 'Curr. Cost per Unit' for clarity
2013-09-18 09:27:34 +10:00
David Cook
3fbd5dc625
Fix 'No Order Cycle' dropdown in Orders & Fulfillment Reports
2013-09-18 09:27:34 +10:00
David Cook
9782dd8264
Get line item cost from order, not current product price which may have changed. Also removed unnecessary total columns.
2013-09-18 09:27:34 +10:00
David Cook
e57ad81934
Add 'No Order Cycle' option and cycle dates to dropdown in Orders & Fulfillment Reports
2013-09-18 09:27:34 +10:00
David Cook
5ec3c1831d
Only show order cycles that the user has access to in reports drop-down
2013-09-18 09:26:50 +10:00
David Cook
fe513d42c4
Rename 'Order Cycles' report group to 'Orders & Fulfillment'
2013-09-18 09:25:51 +10:00
Rohan Mitchell
5d0dabc1e8
Switch to eaterprises spree_paypal_express with instrumentation to debug state-blank-from-paypal issue
2013-09-18 09:15:30 +10:00
Rohan Mitchell
2f73161421
Move patch to address class - much simpler
2013-09-18 07:14:21 +10:00
Rohan Mitchell
56590e2f4a
Instrument saving spree addresses with invalid values in an attempt to track down the cause of some invalid records finding their way into the database
2013-09-17 18:06:06 +10:00
Rohan Mitchell
42a6ad6e7c
Inline spree_last_address into the codebase to attempt to fix errors with it appearing only in prod
2013-09-17 13:48:53 +10:00
Rohan Mitchell
8a849b8e47
When selecting hub, auto-select order cycle if there is only one option available
2013-09-17 10:20:14 +10:00
Rohan Mitchell
a929312979
Add scope: OrderCycle.with_distributor
2013-09-17 09:54:21 +10:00
Rohan Mitchell
c2f1f0986b
Fix broken specs
2013-09-16 14:30:46 +10:00
Rohan Mitchell
d1979a70a1
Fix migration - dependency on modified model relations
2013-09-16 14:26:43 +10:00
Rohan Mitchell
b032bc0420
Add commented-out code for debugging specs that are otherwise thwarted by poltergeist's timeout
2013-09-16 14:13:07 +10:00
Rohan Mitchell
f0381f7579
Fix problems with spree_last_address - upgrade gem to a newer version, add a spec around it
2013-09-16 14:11:00 +10:00
Rohan Mitchell
c1a28023ce
Move js file to avoid clobbering spree file
2013-09-16 14:11:00 +10:00
Rohan Mitchell
9410123841
Convert to github-specific notation in gemfile
2013-09-16 14:11:00 +10:00
David Cook
4f9c7fb601
Remove distributor_id from payment method and update tests
2013-09-13 16:58:19 +10:00
David Cook
ee9d9a36d5
Make distributor payment method multi-select
2013-09-13 12:03:37 +10:00
David Cook
107c6978c2
Create many-to-many relationship between payment method and distributor
2013-09-13 10:25:25 +10:00
David Cook
7e96ba909e
Show a list of Order Cycles report types in the description column
2013-09-13 09:59:35 +10:00
Rohan Mitchell
29e1f38207
Set up production distributors for current order cycle
2013-09-12 18:21:44 +10:00
David Cook
af71838610
Fix deface comment
2013-09-12 15:33:17 +10:00
David Cook
a99f23eb01
Add distributor name to admin orders table
2013-09-12 15:16:51 +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
b8376a040f
Remove superfluous manual change triggers
2013-09-10 12:57:49 +10:00
Rohan Mitchell
a136161dd6
When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header
2013-09-10 12:57:35 +10:00
Rohan Mitchell
583164efb5
Fix variant price calculation
2013-09-10 11:52:13 +10:00
Rohan Mitchell
315876ca9d
Don't display bullets next to variant options
2013-09-10 11:52:04 +10:00
Rohan Mitchell
0e8443e118
Rename 'Change Pick-up Date' to 'Change Collection Date'. Fix this to clear the cart. Do not clear distributor when setting Order.order_cycle to nil.
2013-09-10 11:28:49 +10:00
Rohan Mitchell
d43df754d3
Load correct products on enterprise and product listing pages
2013-09-10 10:36:13 +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
64a3a309f5
Change 'pick-up date' to 'available on', provide absolute dates in options
2013-09-10 09:16:23 +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
Rohan Mitchell
3ac4bd3b5f
Hide adjustments in cart by default, show by click
2013-09-09 14:37:36 +10:00
Rohan Mitchell
644beeb093
Revert "Fix test fail"
...
This reverts commit 1de0f85c73 .
2013-09-09 10:55:40 +10:00
Rohan Mitchell
1de0f85c73
Fix test fail
2013-09-09 10:41:28 +10:00
Rohan Mitchell
d32a8b56d0
When order cycle is selected, only show variants that are in it
2013-09-09 10:40:15 +10:00
Rohan Mitchell
57906e6f8b
Fix seed failure due to ShippingMethod factory creating an enterprise, preventing enterprises from being seeded
2013-09-06 16:01:00 +10:00
Rohan Mitchell
33d1948bda
Display log in / sign up links on landing page
2013-09-06 13:44:35 +10:00
alexs333
80bb55496b
Temporarily disabling some tests.
2013-09-05 14:18:40 +10:00
alexs333
4f64679de7
Simplified shop flow.
2013-09-04 20:33:18 +10:00
alexs333
999bc2697a
Implemented simlified shop flow.
2013-09-04 20:33:18 +10:00
David Cook
25b25b7681
New scope Order.not_state to filter out cancelled orders from reports
2013-08-30 17:07:17 +10:00
David Cook
bf3c5c6dd6
Merge branch 'master' into reports-completed-only
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2013-08-30 16:42:00 +10:00
David Cook
b0abe566eb
Comments
2013-08-30 16:28:02 +10:00
David Cook
6a303d7db9
Merge branch 'enterprise-reports'
...
Conflicts:
app/models/spree/ability_decorator.rb
2013-08-30 16:27:13 +10:00
David Cook
61e5ec24e7
Generalise ModelClassFromControllerName
2013-08-30 15:21:30 +10:00
David Cook
80bfc5ce53
Ensure Supplier enterprise users can only view their own products in reports
2013-08-30 15:17:27 +10:00
Rohan Mitchell
cace60b187
Shipping methods are only shown at checkout if their distributor matches the order
2013-08-30 12:27:13 +10:00
Rohan Mitchell
911d8b8bbc
Shipping method has a distributor, admin can create and edit
2013-08-30 11:43:45 +10:00
Rohan Mitchell
314e464c3f
Add failing spec for admin creatin a shipping method owned by a distributor
2013-08-27 10:53:59 +10:00
Rohan Mitchell
9824e1b9c5
Make spec more precise and robust - query was finding outgoing instead of incoming exchange
2013-08-27 10:41:02 +10:00
Rohan Mitchell
72136a59ae
Remove permission dupliation, fixes accessible_by errors when accessing admin backend
2013-08-27 10:19:54 +10:00
Rohan Mitchell
6a5d819fa6
Enterprise manager can create an order
2013-08-27 10:05:55 +10:00
alexs333
019d8ed2dc
Reverted poltergeist/capybara upgrade.
2013-08-23 17:02:33 +10:00
alexs333
ef96099f2d
Merge branch 'master' of https://github.com/eaterprises/openfoodweb
...
Conflicts:
Gemfile.lock
2013-08-23 16:11:02 +10:00
David Cook
9de5a0061e
Enterprise user can only view their own distributors in reports (and remove redundant feature test)
2013-08-23 16:09:37 +10:00
alexs333
9be7b5eecc
Updated poltergeist.
2013-08-23 15:40:04 +10:00
Rohan Mitchell
4f8014306e
Admin can't change distributor or order cycle once order has been finalized
2013-08-23 14:00:31 +10:00
Rohan Mitchell
158cd6994b
Update spree, syntax fix
2013-08-23 14:00:31 +10:00
Rohan Mitchell
2a662e6b6f
Switch from rvmrc to ruby-version/gemset
2013-08-23 14:00:31 +10:00
Rohan Mitchell
2cab83cb29
Admin create order can set distributor and order cycle
2013-08-23 14:00:31 +10:00
Rohan Mitchell
2e1de9a6d3
Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210 ), fix nil state error
2013-08-23 14:00:31 +10:00
Rohan Mitchell
02089541cd
Syntax tweaks
2013-08-23 14:00:31 +10:00
David Cook
078bd033b6
Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions)
2013-08-23 13:25:42 +10:00
David Cook
1bfb54f310
Refactor authorisation to play nice with Spree instead of patching it (thanks to Rohan's suggestions)
2013-08-23 13:25:10 +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
David Cook
3d32e6480b
Enterprise user can access all OFN reports
2013-08-22 13:07:17 +10:00
David Cook
5b824c1e22
Prevent exception when order has no payments
2013-08-22 13:07:17 +10:00
David Cook
f1c2582e65
WIP: Test for enterprise user access in reports
2013-08-22 12:49:39 +10:00
David Cook
3a75f6b86a
Enterprise user can access all OFN reports
2013-08-22 11:49:18 +10:00
Rohan Mitchell
f870e70560
Enterprise manager can edit and bulk edit enterprises they have access to
2013-08-22 11:40:33 +10:00
David Cook
346113966e
Prevent exception when order has no payments
2013-08-22 11:31:31 +10:00
Rohan Mitchell
aab7176f2c
Enterprise manager can bulk edit products
2013-08-22 11:21:49 +10:00
Rohan Mitchell
d465560dba
Update selenium-webdriver (for test debugging with selenium)
2013-08-22 10:49:42 +10:00
David Cook
b41f6234db
Test to filter report by order cycle
2013-08-21 17:23:55 +10:00
alexs
01ad4a04a4
Bumped up the sleep time in the spec.
2013-08-21 16:26:08 +10:00
alexs
a623e2dee6
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-21 16:05:29 +10:00
alexs
8b4c0682fb
Replaced eaterprises logo with the distributor name header.
2013-08-21 16:05:06 +10:00
David Cook
b2878ddc40
Payment Method must belong to a Distributor
2013-08-21 15:14:01 +10:00
alexs
f5b326ee1a
Fixed the bug where search gets cleared after user clicks inside the suburb input field.
2013-08-21 12:04:35 +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
798565bb42
Overriding accidental commit.
2013-08-21 10:59:25 +10:00
alexs
845f7bb8d7
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-21 10:50:08 +10:00
alexs
f6983078a2
Removed search box and distributor/supplier sidebar from the hub page.
2013-08-21 10:49:43 +10:00
Rohan Mitchell
1a328e9567
Simplify syntax
2013-08-20 16:26:46 +10:00
Rohan Mitchell
31a078a53c
Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface
2013-08-20 16:26:46 +10:00
Rohan Mitchell
673c0dca36
Fix varying shipping amounts
2013-08-20 16:26:46 +10:00
Rohan Mitchell
fa459c0395
Summarise distribution charges: order confirm page and email
2013-08-20 16:26:46 +10:00
alexs
fdf80cac5e
Adjusted specs to accommodate for new (temporary) landing page.
2013-08-20 16:14:29 +10:00
alexs
dd9b6b344f
Changed links to point to the shopfront urls (that set the distributor).
2013-08-20 15:31:43 +10:00
alexs
7061d0c53e
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-20 11:06:06 +10:00
alexs
18d60a1643
Fixed specs broken by new temp landing page (take 1).
2013-08-20 11:05:06 +10:00
Rohan Mitchell
fb33b853dd
Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5
2013-08-20 10:47:56 +10:00
Rohan Mitchell
8dd602f9de
Remove pry from spec
2013-08-20 09:19:38 +10:00
Rohan Mitchell
7b5eca3a50
Fix error when generating checkout email when distributor_info is nil
2013-08-20 09:19:23 +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
Rohan Mitchell
5f01bd6901
Generalise checkout email signoff message
2013-08-19 17:35:09 +10:00
Rohan Mitchell
64c9d4254a
Fix spec failures - enterprise fee calculator type change, distributor info rich text tests, summarised distribution fee at checkout
2013-08-19 17:28:00 +10:00
Rohan Mitchell
0458f7a6bb
Summarise distribution fees in checkout after cart page
2013-08-19 17:02:02 +10:00
Rohan Mitchell
693fa9f37b
Enable enterprises_distributor_info_rich_text by default
2013-08-19 16:47:17 +10:00
Rohan Mitchell
010c58fffd
Ignore libpeerconnection.log from phantomjs
2013-08-19 16:46:51 +10:00
David Cook
5f7cbe3882
Ensure distributor is set on payment method factories
2013-08-19 16:19:18 +10:00
David Cook
5a3ad8e68b
Remove test for payment method with no distributor
2013-08-19 16:19:18 +10:00
Rohan Mitchell
562365311e
Lock enterprise fee adjustments on creation to avoid them being recalculated against order by update hooks
2013-08-19 14:38:51 +10:00
Rohan Mitchell
a9b70e67df
Change to using flat rate per item calculators - per-order is confusing when used against line items
2013-08-19 14:38:51 +10:00
David Cook
3ffe732b30
Ensure valid payment method is selected
2013-08-19 13:57:40 +10:00
David Cook
2d305b59d9
Only show payment methods for the distributor of the order
2013-08-19 13:57:40 +10:00
David Cook
08babeed65
Payment Method must have one Distributor
2013-08-19 13:57:40 +10:00
David Cook
6f73f41700
Create Payment Methods for each Enterprise instead of generic Payment Method
2013-08-19 13:57:40 +10:00
David Cook
77329b5532
Allow user to delete their enterprises' own payment methods
2013-08-19 13:57:40 +10:00
David Cook
4be2fe5fe9
Only show payment methods that user has access to
2013-08-19 13:57:40 +10:00
Rohan Mitchell
c1f9d9789d
Extract table test to private method
2013-08-19 12:29:26 +10:00
Rohan Mitchell
ba4d3d5d7d
Removing a product from cart removes its fees
2013-08-19 12:19:03 +10:00
Rohan Mitchell
6c24c0ef68
Make specs more resilient and less context-sensitive
2013-08-19 11:10:00 +10:00
Rohan Mitchell
24cd5209d6
Do not error when attempting to mix product and order cycle distribution
2013-08-19 10:41:14 +10:00
Rohan Mitchell
80d6e3b87f
Do not charge for distributor fees for a distributor you're not checking out with
2013-08-19 10:41:14 +10:00
Rohan Mitchell
7a75898b2b
Find exchanges going to/from any number of enterprises
2013-08-19 10:41:14 +10:00
Rohan Mitchell
e15e9a1476
Charge order cycle fees
2013-08-19 10:41:14 +10:00
Rohan Mitchell
dfd1a89975
Test whether exchanges are incoming
2013-08-19 10:41:14 +10:00
Rohan Mitchell
9563aad9fa
Find exchanges with a particular variant
2013-08-19 10:41:14 +10:00
Rohan Mitchell
1d23446c40
ProductDistribution validates_presence_of enterprise fee, check no longer required
2013-08-19 10:41:14 +10:00
Rohan Mitchell
591f6a8a57
Move ProductDistribution#clear_all_enterprise_fee_adjustments_for to EnterpriseFee class
2013-08-19 10:41:14 +10:00
Rohan Mitchell
e318a1591d
Add FeatureToggleHelper for tests, enabling feature toggle changes for tests
2013-08-19 10:41:14 +10:00
Rohan Mitchell
5ffd56aad7
Re-write spec with new fee display at checkout
2013-08-19 10:41:14 +10:00
Andrew Spinks
38522e2b74
Fix order cycle permissions for enterprise user.
2013-08-18 19:41:04 +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
8ee98e3d96
Added bugherd to admin and sree frontend and re-arranged the bugherd code.
2013-08-16 15:50:45 +10:00
alexs
d73dc1dc48
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-16 12:13:47 +10:00
alexs
ec9bfa3114
Added BugHerd script for new landing page (staging only).
2013-08-16 12:13:25 +10:00
Andrew Spinks
82726d032c
Add enterprise roles for order cycles.
2013-08-16 11:34:07 +10:00
Rohan Mitchell
19e7537b64
Style order cycle fees
2013-08-16 10:36:41 +10:00
Rohan Mitchell
290607b5bf
CrUD for order cycle exchange fees
2013-08-16 10:22:29 +10:00
Rohan Mitchell
552cecb2e0
Find incoming and outgoing exchanges
2013-08-16 10:22:29 +10:00
Rohan Mitchell
715ec9b21a
Send enterprise id along with exchange enterprise fees
2013-08-16 10:22:29 +10:00
Rohan Mitchell
4d04a24342
Translate exchange fees for processing by rails
2013-08-16 10:22:29 +10:00
Rohan Mitchell
7fc0787e36
OrderCycleFormApplicator sets exchange fees
2013-08-16 10:22:29 +10:00
Rohan Mitchell
20853501e1
Delete unneeded angular scripts
2013-08-16 10:22:29 +10:00
Rohan Mitchell
e6fdcf581a
OrderCycle can fetch the direction of an exchange (incoming/outgoing)
2013-08-16 10:22:29 +10:00
alexs
a3970dde8a
Forcing POST for the search form.
2013-08-16 10:18:46 +10:00
alexs
4e715f62a2
Moved limit into the model.
2013-08-16 09:53:40 +10:00
alexs
82df7cddeb
Added staging environment.
2013-08-15 17:43:21 +10:00
alexs
b8bc30d4ab
Fixed the test setup and added the text for the bug found in 'Enterprise.find_near'.
2013-08-15 17:34:51 +10:00
alexs
a7256611cf
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-15 16:54:47 +10:00
alexs
da68dae586
Added unicorn-rails gem for running unicorn in dev.
2013-08-15 16:34:21 +10:00
alexs
cfffced652
Fixed the bug in the enterprise geo search.
2013-08-15 16:33:41 +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
Andrew Spinks
d160a3256a
Make adding to cart via spree front end kind of work again.
2013-08-15 15:36:35 +10:00
alexs
88484f2d8b
Added tests for suburbs JSON.
2013-08-15 11:40:09 +10:00
alexs
c72a4a961f
Added the mechanism to test JSON APIs (Rabl stuff etc.)
2013-08-15 11:38:52 +10:00
alexs
0705c7af36
Added vertical separators for search results.
2013-08-15 11:37:50 +10:00
alexs
0c8779041f
Slightly increase the top bar height.
2013-08-15 11:35:24 +10:00
alexs
d3842b2d8d
Further compressed the landing page image to make it really light.
2013-08-15 11:34:48 +10:00
alexs
bdc8387346
Added base for shop front (enterprise).
2013-08-14 17:31:25 +10:00
alexs
e1da63d18f
Added some more dev sample data.
2013-08-14 17:30:17 +10:00
alexs
42c912bb0d
Using webmock for test group only.
2013-08-14 17:26:42 +10:00
alexs
773c2b4217
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-14 11:31:25 +10:00
Rohan Mitchell
c39bd6b59d
Remove shipping methods with the now-absent itemwise calculator
2013-08-14 11:27:16 +10:00
Rohan Mitchell
eaf71e28bb
Raise an error when tests hit the network
2013-08-14 11:19:16 +10:00
alexs
a8a0c0513e
Fixed id duplication for login and sign up forms.
2013-08-14 11:12:36 +10:00
Andrew Spinks
9c6c4724be
Ensure line items only get created in correct orders when adding a product to a cart.
2013-08-14 10:49:55 +10:00
Andrew Spinks
0f1142fc30
Define class used in migration.
2013-08-14 10:49:55 +10:00
Andrew Spinks
d5791657f3
Support multiple orders when adding a product to a cart.
2013-08-14 10:49:55 +10:00
Andrew Spinks
dd3aaccf9f
When adding a variant to a cart, split into multiple orders depending on the distributors that it contains.
2013-08-14 10:49:55 +10:00
Andrew Spinks
20bb5c9de7
Make sure angular injections work after magnification.
2013-08-14 10:49:55 +10:00
Andrew Spinks
59fce8a964
Show line items for each order in multi-cart.
2013-08-14 10:49:55 +10:00
Andrew Spinks
0a39fb87a5
Fix multi-cart association and add some temporary multi-cart support into the current front end.
2013-08-14 10:49:54 +10:00
alexs
77d31b3004
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-14 10:48:47 +10:00
Rohan Mitchell
5fac29d2ed
Do not merge current and incomplete orders when logging in - fixes #20
2013-08-14 10:44:02 +10:00
alexs
48cb725da5
Upgraded fundation to fetch from the edge (until the next release when gmaps4rails integration is fixed).
2013-08-14 10:39:42 +10:00
alexs
9501d2c8a1
Core of sign up functionality.
2013-08-14 10:38:49 +10:00
alexs
6b760f3068
Added feedback info for search criteria.
2013-08-14 10:37:25 +10:00
alexs
51c898625e
Fixed link colors on map view.
2013-08-14 10:36:04 +10:00
Rohan Mitchell
8ff749d0eb
Find enterprises participating in an order cycle
2013-08-14 09:48:45 +10:00
Rohan Mitchell
0293942816
Add order cycle service method to add and remove exchange fees
2013-08-14 09:48:45 +10:00
Rohan Mitchell
13df3b098b
Make error messages more descriptive
2013-08-14 09:48:45 +10:00
Rohan Mitchell
47f6a5fbbf
Add controller methods to add and remove exchange fees
2013-08-14 09:48:45 +10:00
Rohan Mitchell
f67a6fa3fb
Extract coordinator fees to partial
2013-08-14 09:48:45 +10:00
Rohan Mitchell
4120bc3dca
Output exchange fees as JSON
2013-08-14 09:48:45 +10:00
David Cook
293661377e
Remove text to the left of TOTAL
2013-08-13 17:01:19 +10:00
David Cook
015dbc5c01
Only show active or complete order cycles, ordered by cycle close date
2013-08-13 16:47:23 +10:00
David Cook
6bad6e2675
Add order cycle selection to Order Cycles Report
2013-08-13 15:48:04 +10:00
alexs
0a5f8afcb6
Added modal placeholders for new distributors and farmers sections.
2013-08-13 15:20:21 +10:00
alexs
3cf58c8415
Re-enabled Foundation JavaScript.
2013-08-13 15:19:37 +10:00
alexs
e1a876a4b5
Added default minimum height for text areas.
2013-08-13 15:19:03 +10:00
alexs
1a3c09a846
Temporarily downgraded zurb foundation to make it work with gmaps4rails (will be fixed in future release of Foundation).
2013-08-13 15:18:31 +10:00
alexs
886ac4a892
Added an escape patch with a small logo.
2013-08-13 12:07:32 +10:00
alexs
7206bf6393
Re-adjusted vertical positioning of the landing page.
2013-08-13 11:49:04 +10:00
alexs
e90ccef337
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-13 11:40:54 +10:00
alexs
779befe3cf
Links to the enterpise pages.
2013-08-13 11:40:35 +10:00
alexs
6a17f80c93
Added logo to the landing page.
2013-08-13 11:40:14 +10:00
alexs
72a422f7e7
Added the link that navigates to the current enterprise shopfront (for now).
2013-08-13 11:38:19 +10:00
alexs
8b87c33c97
Added layout based wrapping for the main component (used in off canvas layout).
2013-08-13 11:37:36 +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
David Cook
6c4ace8d14
Ensure that all PaymentMethod-derived classes also allow distributor_id
2013-08-13 10:57:36 +10:00
David Cook
725766d82e
Feature tests for PaymentMethod in admin and checkout
2013-08-13 10:57:36 +10:00
David Cook
98d520f0e3
Filter PaymentMethods by distributor
2013-08-13 10:55:52 +10:00
David Cook
1621e4c4a4
Add distributor to PaymentMethod
2013-08-13 10:55:51 +10:00
Rohan Mitchell
f3447f2898
Remove shipping method field from product distributions
2013-08-13 10:14:51 +10:00
Rohan Mitchell
5f4313b588
Remove itemwise shipping calculator
2013-08-13 10:14:39 +10:00
Rohan Mitchell
b71f7eec3d
Fix spec for charges by adjustment not shipping method
2013-08-13 09:11:26 +10:00
Rohan Mitchell
43f482a803
Remove use of deprecated rspec syntax
2013-08-13 09:11:26 +10:00
Rohan Mitchell
7677f79f17
Remove the now-unused Product#shipping_method_for_distributor
2013-08-13 09:11:26 +10:00
Rohan Mitchell
94e49d4190
Remove line item specs for removed functionality
2013-08-13 09:11:26 +10:00
Rohan Mitchell
7e30b664f2
Add enterprise fees relation to enterprise
2013-08-13 09:11:26 +10:00
Rohan Mitchell
c011de539d
Update rake task for product distribution fees by enterprise fee
2013-08-13 09:11:25 +10:00
Rohan Mitchell
b5d324ec8c
Drop itemwise shipping method use in tests
2013-08-13 09:11:25 +10:00
Rohan Mitchell
9aad44f093
Strip shipping method mechanics out of LineItem and Order
2013-08-13 09:11:25 +10:00
Rohan Mitchell
60956e9789
Display sum of distribution fees at cart by adjustment, not shipping methods
2013-08-13 09:11:25 +10:00
Rohan Mitchell
b7ea03f7fc
Remove distributor fees table at checkout, pending design of new breakdown
2013-08-13 09:11:25 +10:00
Rohan Mitchell
2379cc0c3c
Do not display double error when using js
2013-08-13 09:11:25 +10:00
alexs
03b36bb14b
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-12 17:35:36 +10:00
alexs
f2f507c5c7
Suburb auto-complete functionality for the new landing page.
2013-08-12 17:34:56 +10:00
David Cook
c5f0848a56
More comments
2013-08-12 14:44:27 +10:00
David Cook
03b8b042ba
Deleted: libpeerconnection.log
2013-08-12 14:44:27 +10:00
David Cook
5baf9938e1
Ensure capture shortcut button shows for the correct payment
2013-08-12 14:44:26 +10:00
David Cook
c915bb91cf
More tests for distributor enterprise user roles
2013-08-12 14:44:26 +10:00
David Cook
2ae4efbeba
Add more order privileges for distributor enterprise users
2013-08-12 14:44:26 +10:00
David Cook
c645ad25a7
Add more order privileges for distributor enterprise users
2013-08-12 14:44:26 +10:00
Rohan Mitchell
d7cce918f5
Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees
2013-08-12 14:22:11 +10:00
Rohan Mitchell
f1485bf9c5
Remove shipping method from product distribution in factory.
2013-08-12 14:21:39 +10:00
Rohan Mitchell
af6b16ecc4
Admin can assign enterprise fees to product distributions
2013-08-12 11:05:00 +10:00
Rohan Mitchell
7ea1122833
Make spec naming consistent
2013-08-12 10:13:31 +10:00
Rohan Mitchell
14268b7be0
Create adjustment metadata when creating adjustment
2013-08-12 10:00:35 +10:00
Rohan Mitchell
149d48ff5a
Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation
2013-08-12 10:00:35 +10:00
Rohan Mitchell
ba0b3bad85
Convert product distribution shipping methods to enterprise fees
2013-08-12 10:00:35 +10:00
alexs
94cab872a5
Temporarily removing ssl enforcing.
2013-08-11 17:53:53 +10:00
alexs
efc5943f57
Increase compression for landing page images.
2013-08-11 17:38:25 +10:00
alexs
653525e9b0
Updated the spec to reflect the field name change.
2013-08-11 17:19:17 +10:00
alexs
e9110ac752
Merge branch 'master' of github.com:eaterprises/openfoodweb
...
Conflicts:
Gemfile.lock
2013-08-11 16:59:02 +10:00
alexs
71262d3cb3
Base for enterprise search via suburb selector..
2013-08-11 16:57:00 +10:00
alexs
51a4795763
Added rack-ssl and spinjs.
2013-08-11 16:52:34 +10:00
Rohan Mitchell
b065d7db36
When updating product distribution charge, skip line items that don't have a product distribution
2013-08-09 15:30:35 +10:00
Rohan Mitchell
b84c476348
Upgrade Rails to 3.2.14, use forked spree with calculators that are compatible with LineItems
2013-08-09 15:30:35 +10:00
Rohan Mitchell
b4a7ccf1b4
Adjustments on LineItems don't modify the order total. Make adjustments on Order instead.
2013-08-09 15:28:48 +10:00
Rohan Mitchell
513993324d
Clean up old adjustments when changing distributor
2013-08-09 15:27:52 +10:00
Rohan Mitchell
fd989e3a77
Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items.
2013-08-09 15:27:52 +10:00
Rohan Mitchell
239dd29511
Weight calculator will calculate against a single line item as well as an order
2013-08-09 15:27:52 +10:00
Rohan Mitchell
a338c974f8
Create line item adjustments for product distributions
2013-08-09 15:27:52 +10:00
Rohan Mitchell
8c9a3c8a91
Add Product#product_distribution_for
2013-08-09 15:26:57 +10:00
alexs
295d86affb
Removed the test that is believed to be incorrect and failing build.
2013-08-09 14:44:54 +10:00
alexs
834cec48bf
Forcing site-wide SSL for production and staging environments.
2013-08-09 13:28:58 +10:00
alexs
4ff8e825e9
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-09 13:21:24 +10:00
alexs
d3ab78e2c6
Assets for gmap4rails gem.
2013-08-09 13:20:49 +10:00
alexs
b5cc2ab4cf
Added postcode search that redirect to page with map view.
2013-08-09 13:20:22 +10:00
alexs
39623d45d6
Tests for building full addresses.
2013-08-09 13:19:07 +10:00
alexs
3b4c02865f
Tests for logging in from the new landing page.
2013-08-09 13:16:58 +10:00
alexs
7c96c17c88
Tests for geo search.
2013-08-09 13:15:36 +10:00
alexs
1ca306e09e
Added RSpec matchers to test delegations.
2013-08-09 13:14:49 +10:00
Andrew Spinks
bc57364c7e
Add simple angular cart to the main page.
2013-08-08 18:31:56 +10:00
Andrew Spinks
ac37dff946
Add controller for cart and beginnings of an API.
2013-08-08 18:31:56 +10:00
Andrew Spinks
7fe1aab903
Simplest version of a cart that supports multiple orders.
2013-08-08 18:31:56 +10:00
alexs
7d2e6c57bc
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-08 11:43:26 +10:00
alexs
f45ed42bdb
Skeleton for the search results.
2013-08-08 11:42:45 +10:00
Andrew Spinks
7bd0582b50
remove pry call
2013-08-08 10:48:05 +10:00
alexs
44e06fe7fc
Added search stuff to the least of assets to precompile.
2013-08-08 10:43:21 +10:00
alexs
7f74b85040
Markup tweak.
2013-08-07 19:26:21 +10:00
alexs
8efc95e095
Separated Foundation powered site from the Spree powered content (for now).
2013-08-07 19:25:48 +10:00
alexs
97ff668029
Fixed the finder ('all' finder was used in seed test instead of singular one).
2013-08-07 19:24:57 +10:00
alexs
28f94ae959
Stubbed out geolocation.
2013-08-07 18:03:41 +10:00
alexs
1992675794
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-07 14:09:30 +10:00
alexs
999ba2cf56
Added more real australian addresses to seed data as well some enterprises that use those addresses.
2013-08-07 14:07:55 +10:00
alexs
00743fada8
Added foundation gem to the right group.
2013-08-07 14:06:40 +10:00
alexs
ef39d0ce31
Geocoded Spree addresses
2013-08-07 14:01:27 +10:00
Andrew Spinks
7fbb5b13fb
Fix line item cache migration to work across orders in the staging servers.
2013-08-07 12:44:05 +10:00
David Cook
c247c2d3ea
WIP: Allow distributor enterprise user to access their orders
2013-08-07 09:19:28 +10:00
David Cook
577b114662
Add distributor and supplier users to load_sample_data task
2013-08-07 09:19:28 +10:00
alexs
3f82147024
Merge branch 'master' of github.com:eaterprises/openfoodweb
...
Conflicts:
db/schema.rb
2013-08-06 18:32:53 +10:00
alexs
82ea8adfe3
Added list of geocoded suburbs.
2013-08-06 18:31:08 +10:00
Rohan Mitchell
f1dbc03401
Use correct amount for order total in spec
2013-08-06 13:47:17 +10:00
Rohan Mitchell
8fdf0b6ff9
Fix payment not being captured due to being to small to cover order's distribution fee
2013-08-06 13:47:17 +10:00
Rohan Mitchell
cfb8c05cb5
Remove association that's already added by Spree's calculated_adjustments
2013-08-06 13:47:17 +10:00
Rohan Mitchell
d8b7a05441
Add EnterpriseFee to ProductDistributions
2013-08-06 13:47:17 +10:00
Rohan Mitchell
ec3e00c128
Refactor LineItem and clients for new fields
2013-08-06 13:47:17 +10:00
Rohan Mitchell
be1127b414
Migrate line item shipping_method cache to distribution_fee/shipping_method_name
2013-08-06 13:47:17 +10:00
alexs
57e185af78
Merge branch 'landing_page'
2013-08-06 12:35:06 +10:00
alexs
17f9a4645a
Added login to the landing page.
2013-08-06 12:34:22 +10:00
David Cook
27c17d6b07
Test that enterprise user can't access other enterprises' products
2013-08-06 11:22:44 +10:00
David Cook
0a7c5d4992
Add cancan ability tests on enterprise user roles
2013-08-06 11:12:37 +10:00
David Cook
7a92d99817
Remove unnecessary test on editing product (now tested under cancan abilities)
2013-08-06 11:12:06 +10:00
David Cook
fd8fc480dc
Always show supplier form for enterprise user again (list is now filtered according to enterprise_roles)
2013-08-06 10:56:31 +10:00
David Cook
2347acc2c1
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-08-06 09:23:30 +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
David Cook
a2b612e723
Add clone and destroy product access for enterprise users
2013-08-05 15:21:20 +10:00
David Cook
c40d694a15
Output correct task name
2013-08-05 15:20:35 +10:00
Andrew Spinks
b0d9596489
Fix bug with available on translation - seemed to be getting overridden.
2013-08-05 10:00:47 +10:00
Andrew Spinks
e75021d7bd
Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way.
2013-08-02 18:13:42 +10:00
Andrew Spinks
9d32a5775a
Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products.
2013-08-02 16:08:10 +10:00
Andrew Spinks
269294612d
Add product tests for an enterprise user.
2013-08-02 14:01:45 +10:00
Andrew Spinks
0bb4f676e1
Add permissions to enterprise users so they can manage their own products.
2013-08-02 11:51:25 +10:00
Andrew Spinks
5bccd38b5e
Fix tests - don't have feature toggle overrides on when running tests!
2013-08-01 15:37:42 +10:00
Andrew Spinks
46474ea4cc
Prevent order cycle validations on orders when feature toggled off.
2013-08-01 15:01:47 +10:00
Andrew Spinks
287bd57a4e
Fix loading of initial data to ensure there is an itemwise shipping method.
2013-08-01 10:52:06 +10:00
Andrew Spinks
65617e0e77
Add enterprise roles for a user and wire up interface.
2013-08-01 10:32:50 +10:00
Andrew Spinks
4f5679aac3
Add EnterpriseRole model and link up to users and enterprises.
2013-08-01 10:32:49 +10:00
Andrew Spinks
5810503068
Move test data seeding into separate rake task. Add new role to seeds file.
2013-08-01 10:31:58 +10:00
Rohan Mitchell
c64944d11a
Fix test
2013-07-30 17:32:53 +10:00
Rohan Mitchell
4a893fd548
Style
2013-07-30 13:49:38 +10:00
Rohan Mitchell
4a0e35deef
Clear coordinator fees when coordinator changes
2013-07-30 13:46:30 +10:00
Rohan Mitchell
d64bcf0e94
Remove coordinator fees
2013-07-30 11:55:21 +10:00
Rohan Mitchell
24b957dc57
Process coordinator fees before submit to Rails to use _ids field. Add ng spec for OrderCycle.update. Add acceptance specs for create/edit/update coordinator fees.
2013-07-30 11:34:10 +10:00
Rohan Mitchell
dc7f8986a0
Click to add coordinator fee
2013-07-30 11:34:10 +10:00
Rohan Mitchell
ae0f82b479
Display only coordinator fees belonging to the selected coordinator
2013-07-30 11:34:10 +10:00
Rohan Mitchell
43474d6408
Display coordinator fees on admin edit order cycle
2013-07-30 11:34:10 +10:00
Rohan Mitchell
13a1809d6c
Load enterprise fees in controllers
2013-07-30 11:34:10 +10:00
Rohan Mitchell
93e7ac53ad
Add EnterpriseFee service for order cycles admin
2013-07-30 11:34:10 +10:00
Rohan Mitchell
f613da30d0
Output order cycle coordinator fees in JSON
2013-07-30 11:34:10 +10:00
Rohan Mitchell
a19a43da79
Add blank enterprise fees in js rather than in controller
2013-07-30 11:34:10 +10:00
Rohan Mitchell
122b9b5617
Make order cycle coordinator fees many-to-many
2013-07-30 11:34:10 +10:00
alexs
bb9368a1b2
Listed dependecy on PhantomJS.
2013-07-29 18:20:34 +10:00
Andrew Spinks
d107786614
Make sure the payment details are shown prominently in the checkout screen.
2013-07-29 16:29:27 +10:00
Rohan Mitchell
dcc23078ff
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-07-29 11:52:06 +10:00
Rohan Mitchell
36a124c10e
Fix merge issues: DCV name change and application controller var name issues.
2013-07-29 11:49:43 +10:00
alexs
285353fb9a
Updated copyright info.
2013-07-29 11:13:48 +10:00
Rohan Mitchell
7640eb497a
Merge branch 'supplied-active-products-on-hand'
...
Conflicts:
app/controllers/application_controller.rb
app/models/enterprise.rb
app/views/spree/products/_source_sidebar.html.haml
spec/features/consumer/distributors_spec.rb
spec/models/enterprises_spec.rb
2013-07-29 11:05:42 +10:00
Rohan Mitchell
863236b827
Remove speculative test
2013-07-29 09:47:28 +10:00
David Cook
6265dfc80d
remove block commented code
2013-07-29 09:29:23 +10:00
Andrew Spinks
5adab948c9
Re-instate old order checkout behaviour.
2013-07-26 14:30:54 +10:00
Andrew Spinks
1797933501
Remove xvfb from travis deploy. Should no longer be required.
2013-07-25 14:13:06 +10:00
Andrew Spinks
6c18c5c65f
Fix bulk product edit so that it works with products with a blank available_on field.
2013-07-25 13:51:37 +10:00
Andrew Spinks
39536b2a13
And another dependency getting lost.
2013-07-24 17:52:15 +10:00
Andrew Spinks
54a79bc6ab
Fix other dependency injection problems in bpe angular code after magnification.
2013-07-24 17:47:48 +10:00
Andrew Spinks
24414036b9
Attempt to fix bulk product angular dependency injection which breaks on minification.
2013-07-23 18:16:39 +10:00
alexs
fadb1e4710
Merge branch 'master' of github.com:eaterprises/openfoodweb
...
Conflicts:
Gemfile
2013-07-23 18:02:28 +10:00
alexs
37a88a1be6
Changed JavaScript driver from selenium to phantomjs.
2013-07-23 17:54:05 +10:00
Rohan Mitchell
1d5e970b47
Fix test regressions with multiple 'Save and Continue' buttons in checkout
2013-07-23 17:48:54 +10:00
Rohan Mitchell
dd97768947
Merge branch 'move-save-checkout-button'
...
Conflicts:
spec/features/consumer/checkout_spec.rb
2013-07-23 17:03:00 +10:00
Rohan Mitchell
638d7b1c33
Stylistic changes, extract commented code to private method
2013-07-23 17:02:06 +10:00
Rohan Mitchell
2f83cecc23
Merge branch 'add-capture-order-shortcut-deface'
...
Conflicts:
spec/support/request/authentication_workflow.rb
2013-07-23 16:55:33 +10:00
Rohan Mitchell
d83e8cb3ba
Remove commented out code, clean up comments and style
2013-07-23 16:51:22 +10:00
Rohan Mitchell
1dd92d0133
Move deface to a partial
2013-07-23 16:50:42 +10:00
Andrew Spinks
1add182757
Feature toggle order cycles.
2013-07-23 15:57:43 +10:00
Andrew Spinks
8e560a59c9
Fix selection of itemwise shipping method that broke after the spree upgrade.
2013-07-23 15:46:07 +10:00
Andrew Spinks
7cb054f430
Merge branch 'master' into order-cycle-selection
...
Conflicts:
Gemfile
Gemfile.lock
app/controllers/spree/orders_controller_decorator.rb
app/models/enterprise.rb
app/models/spree/order_decorator.rb
app/views/spree/checkout/_other_available_distributors.html.erb
app/views/spree/products/_add_to_cart.html.haml
lib/open_food_web/distributor_change_validator.rb
spec/spec_helper.rb
2013-07-23 14:42:57 +10:00
Rohan Mitchell
f580b43619
Merge remote-tracking branch 'origin/master'
2013-07-23 14:03:08 +10:00
Rohan Mitchell
b73c584c3b
Update order confirmation email in line with changes in spree
2013-07-23 14:00:29 +10:00
Rohan Mitchell
3315191b81
Fix intermittent admin-user-has-no-admin-role error in specs
2013-07-23 14:00:07 +10:00
Rohan Mitchell
7532ebee5a
Require feature toggle within engines needs require_relative
2013-07-23 13:59:39 +10:00
alexs
418393afbd
Updated requirements documentation.
2013-07-23 13:53:00 +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
Rohan Mitchell
86616c4a6c
Add sass gem explicitly
2013-07-23 10:47:35 +10:00
Rob H
de78d09790
New branch for spree_last_address to fix compatibility issue with spree_auth_devise 1.3
2013-07-23 10:43:08 +10:00
Rob H
0322f21e5c
Rearrange bpe action buttons
2013-07-23 10:43:08 +10:00
Rob H
275b64c7d3
Fix broken delete action for variants
2013-07-23 10:43:08 +10:00
Rob H
ba04d0ea74
Increase wait time for delete action in bpe specs
2013-07-23 10:43:08 +10:00
Rob H
4c435e118a
BPE action buttons in separate columns
2013-07-23 10:43:08 +10:00
Rob H
3c973178fd
WIP: remove unneeded representative-based data request infrastructure
2013-07-23 10:43:08 +10:00
Rob H
961d63ec4c
WIP: Fix references in js tests for bpe
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
8f6ec9bd9b
WIP (Spree Update): Fix frontend order payment summary
2013-07-23 10:43:08 +10:00
Rob H
45309d6a75
WIP (Spree Update): Remove unrequired reference to AnalyticsHelper
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
1f152d8121
WIP (Spree Update): Update authentication workflow input names
2013-07-23 10:43:08 +10:00
Rob H
78263f6835
WIP (Spree Update): change formats of tab overrides
2013-07-23 10:43:08 +10:00
Rob H
56f507dc03
WIP (Spree Update): Bump spree_auth_devise to resolve issue with admin 'Configuration' tab
2013-07-23 10:43:08 +10:00
Rob H
f055ece503
WIP (Spree Update): update variables.css.scss
2013-07-23 10:43:08 +10:00
Rob H
7941a61879
WIP (Spree Update): Update Spree 1.3.3, install and run migrations
2013-07-23 10:43:08 +10:00
Rob H
108dd6e619
Update Rails to 3.2.13 from 3.2.11
2013-07-23 10:42:07 +10:00
Rob H
19fbbb8374
BPUR: match product supplier on clone
2013-07-23 10:40:42 +10:00
Rob H
c826b18584
Wait for variants and products to be deleted
2013-07-23 10:40:42 +10:00
Rob H
f169dcda88
BPUR: Fix final unstable tests, js concurrency etc.
2013-07-23 10:40:42 +10:00
Rob H
ba840124d2
Install rabl and oj
2013-07-23 10:40:42 +10:00
Rob H
2384c4a43e
Remove naughty pry
2013-07-23 10:37:51 +10:00
Rob H
126f11683d
BPUR: Add datetimepicker to Available On
2013-07-23 10:37:51 +10:00
Rob H
23a56ff4f1
BPUR: toggle visbility of columns
2013-07-23 10:37:51 +10:00
Rob H
f750251cb8
BPUR: Visually differentiate products and variants in table
2013-07-23 10:37:51 +10:00
Rob H
5d30df5717
BPUR: add supplier name to product model to allow searching
2013-07-23 10:37:50 +10:00
Rob H
f9832d1375
BPUR: Remove unnecessary setValidity method in ngDecimal
2013-07-23 10:37:50 +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
0ddd9cc6d0
BPUR: use where rather than select for product collection
2013-07-23 10:37:50 +10:00
Rob H
9beb560b72
BPUR: cancel any pre-existing timeouts on message models when new message set
2013-07-23 10:37:50 +10:00
Rob H
b775145b16
BPUR: Add ability to filter by search and toggle variants
2013-07-23 10:37:50 +10:00
Rob H
57f2eff1b0
BPUR: Add warnings before deleting products/variants or directing to edit page
2013-07-23 10:37:50 +10:00
Rob H
ef435dc6da
Typo
2013-07-23 10:37:50 +10:00
Rob H
8453b43c25
BPUR: Allow updating of delegated variant properties
2013-07-23 10:37:50 +10:00
Rob H
1bd4875a6f
BPUR: Can clone products
2013-07-23 10:37:50 +10:00
Rob H
89e684a328
BPUR: add js tests for deleting products and variants
2013-07-23 10:37:50 +10:00
Rob H
e8f24dc2dd
BPUR: Add edit link for products and variants
2013-07-23 10:37:50 +10:00
Rob H
febb9a44a2
Remove commented (unrequired) lines on code
2013-07-23 10:37:50 +10:00
Rob H
c503c1b10c
BPUR: refactor of filterSubmitProducts
2013-07-23 10:37:50 +10:00
Rob H
dcf6446450
BPUR: can delete variants
2013-07-23 10:37:50 +10:00
Rob H
5db0d839fa
BPUR: can delete products
2013-07-23 10:37:50 +10:00
Rob H
8179f45272
BPUR: remove unused product update js and tests
2013-07-23 10:37:50 +10:00
Rob H
5258cba2a2
BPUR: change to live tracking of dirty properties (variant price update still failing)
2013-07-23 10:37:50 +10:00
Rob H
c80cba7fa5
BPUR: Don't use master variant to update attributes. Changes to product filtering.
2013-07-23 10:37:50 +10:00
Rob H
0ca0abd0b2
Can alter on_hand and price of individual variants
2013-07-23 10:37:50 +10:00
Rob H
f3d778af1a
BPUR: can update master on_hand
2013-07-23 10:37:50 +10:00
Rob H
fbb3657bdc
BPUR: can update master price. Test refactor and added angular ng-decimal directive
2013-07-23 10:37:50 +10:00
Rob H
44ad7584f0
BPUR: can update available_on
2013-07-23 10:37:50 +10:00
Rob H
f12c1c00d0
BPUR: rearrange acceptance tests
2013-07-23 10:37:50 +10:00
Rob H
344a084494
BPUR: can update supplier
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
246c6de495
WIP: remove reference to pry
2013-07-23 10:37:50 +10:00
Rob H
6b097eb9f8
WIP: minor fixes to bulk product update js
2013-07-23 10:37:50 +10:00
Rob H
3c57680303
WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet
2013-07-23 10:37:50 +10:00
Rob H
74291ab1f7
remove leftover debugger; call in code
2013-07-23 10:37:50 +10:00
Rob H
554c67f1a3
WIP: specs and basic js infrastructure for bulk product update
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
alexs
bcac56df0e
Upgraded pry-debugger.
2013-07-23 10:16:48 +10:00
David Cook
2e2dc216fa
WIP: writing order scope test
2013-07-22 17:33:50 +10:00
alexs
15f212713b
Updated rvmrc with rvm auto generated scripts.
2013-07-22 17:33:34 +10:00
David Cook
9f1a7746a4
WIP: start writing order scope test
2013-07-22 17:30:01 +10:00
David Cook
8017d79de4
remove report tests (will test scope not_state instead)
2013-07-22 17:17:18 +10:00
Andrew Spinks
4cdd858f48
Disable order cycles in the front end by default.
2013-07-22 17:16:55 +10:00
Rohan Mitchell
bc913fd355
Reset ActionMailer::Base.deliveries at start of test - http://stackoverflow.com/questions/5843284/clearing-out-activemailerbase-deliveries-after-rspec-test
2013-07-22 16:58:53 +10:00
Rohan Mitchell
f5f5433738
Require pry in test env outside of Travis
2013-07-22 16:56:00 +10:00
Rohan Mitchell
452ccfdb68
Remove debug statement
2013-07-22 16:55:44 +10:00
Rohan Mitchell
2ddc5b4e4a
Move strip_html to main app, fixes context-sensitive chili feature spec fail
2013-07-22 16:21:32 +10:00
Rohan Mitchell
d9988dac09
Remove unneeded feature application controllers and rake task files
2013-07-22 16:15:35 +10:00
David Cook
55277e2f0a
test for inactive enterprises being counted in 'x more' on sidebar, disable limit test
2013-07-22 14:55:46 +10:00
David Cook
66d345d360
fix 'x more' count, disable sidebar limit (config for this to be implemented later)
2013-07-22 14:53:08 +10:00
Rohan Mitchell
d0421cbc4d
Define feature toggles in FeatureToggle class rather than ENV['OFW_DEPLOYMENT']
2013-07-22 14:34:29 +10:00
Rohan Mitchell
7b1d1f1d42
Add FeatureToggle config to replace ENV['OFW_DEPLOYMENT']
2013-07-22 12:11:52 +10:00
alexs
1ea48af98b
Updated contributors list.
2013-07-22 11:56:33 +10:00
alexs
5e4cabc967
Merge branch 'master' of github.com:eaterprises/openfoodweb
2013-07-22 11:49:09 +10:00
alexs
40bd0e9c58
Fixed product seed.
2013-07-22 11:48:59 +10:00
alexs
3b4ad6558c
Added .rvmrc.
2013-07-22 11:48:39 +10:00
alexs
6f57c2a01a
Bumped up debugger-ruby_core_source version to address bundle installation issues.
2013-07-22 11:48:12 +10:00
Rohan Mitchell
6ceb8e9ee7
Restore change: render checkout distributor details from partial
2013-07-22 11:23:48 +10:00
Rohan Mitchell
568837aa53
Revert "On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME"
...
This reverts commit b7f7766893 .
2013-07-22 11:22:20 +10:00
Rohan Mitchell
efec0b07d6
Merge branch 'amazon-ec2'
...
Conflicts:
Gemfile
Gemfile.lock
2013-07-22 10:29:11 +10:00
David Cook
f0755f34aa
tidy up javascript, remove unnecessary disableSaveOnClick
2013-07-19 17:05:09 +10:00
David Cook
15c454a0f1
move style to stylesheet
2013-07-19 17:04:04 +10:00
David Cook
46043f2237
click new 'Save and Continue' button
2013-07-16 17:02:06 +10:00
David Cook
0a25dfc679
remove disabled flag
2013-07-16 17:01:12 +10:00
David Cook
050b884076
remove old-style deface file in favour of new .deface format
2013-07-16 17:00:04 +10:00
David Cook
1d2704ab4c
Clean up comments
2013-07-16 15:55:28 +10:00
David Cook
c9432288c5
Clean up comments and use admin_orders_path for checking current page
2013-07-16 15:36:14 +10:00
David Cook
0ad7cde198
Add factory for an order with items and valid distributor
2013-07-12 16:42:33 +10:00
David Cook
4fc0608a44
Finish capture order test
2013-07-12 16:41:20 +10:00
David Cook
a76232bb7e
Make sure admin_user has admin privilege for new version of Spree
2013-07-12 14:02:37 +10:00
Rohan Mitchell
5683656605
Merge branch 'invalid-login-message'
2013-07-12 13:07:30 +10:00
David Cook
7341d5e11a
ignore Sublime project files
2013-07-05 16:24:37 +10:00
David Cook
8df0f30b4f
Move override into .deface format, and removed unecessary bits
2013-07-05 16:08:26 +10:00
David Cook
50b5d13e1f
Add javascript to hide new save button if not supported (not yet tested on old browsers)
2013-06-28 17:53:39 +10:00
David Cook
5b58351b73
minor changes
2013-06-28 17:04:58 +10:00
David Cook
3007549aa5
use .length instead of .count which produced unexpected results
2013-06-28 17:02:26 +10:00
Rohan Mitchell
3de52b10b2
Fix JS error: Unknown provider: a from order_cycle
2013-06-25 12:31:28 +10:00
Rohan Mitchell
ce2c6c5661
Fix uninjected directive for enterprise fees
2013-06-25 12:17:15 +10:00
Rohan Mitchell
b7a778b0de
Define order cycles JS methods in a minification-friendly manner
2013-06-25 10:58:12 +10:00
Rohan Mitchell
f78db2493f
Define enterprise fees controller in a minification-safe manner
2013-06-25 10:35:45 +10:00
Rohan Mitchell
2373601e9d
Switch to Karma for angluar testing
2013-06-25 10:35:17 +10:00
Rohan Mitchell
37a4ad3372
Don't 500 when setting cart order cycle to nil
2013-06-21 17:04:47 +10:00
David Cook
a63b8908bb
Moved inline style to stylesheet
2013-06-21 16:12:56 +10:00
David Cook
0525abb084
Test that scopes don't return deleted products
2013-06-21 15:53:12 +10:00
David Cook
250e76c281
Fix incorrect count of enterprises (due to bug in rails issue #5554 )
2013-06-21 15:10:21 +10:00
Rohan Mitchell
ae43fd1333
Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages.
2013-06-21 11:36:24 +10:00
Rohan Mitchell
72f1c52b3e
Update Order model distribution validation - make fully inclusive of order cycles
2013-06-21 11:35:42 +10:00
Rohan Mitchell
bc40b2c856
Test each distinct distributor/order cycle invalid combination case
2013-06-21 11:06:21 +10:00
David Cook
7121860416
new view to display all distributors
2013-06-21 10:53:24 +10:00
David Cook
2e6387ac60
test available_on for distributors
2013-06-21 10:52:15 +10:00
David Cook
38c0552362
test 'more' count
2013-06-21 10:47:04 +10:00
David Cook
2d64e257ff
break long lines into two; no functional change
2013-06-21 10:45:11 +10:00
David Cook
d95903a82d
add html output format for all distributors
2013-06-21 10:44:16 +10:00
David Cook
b0e4bef75e
rename sidebar collection variables to avoid clash, fix count to be distinct
2013-06-21 10:42:42 +10:00
Rohan Mitchell
3386da4b4c
Validate distribution combination for new products added to cart
2013-06-21 10:39:08 +10:00
Rohan Mitchell
cfcc8c3fb2
Fix DistributionChangeValidator#variants_available_for_distribution: Do not show products distributed through a different order cycle
2013-06-21 10:34:39 +10:00
Rohan Mitchell
69019859da
Refactor views
2013-06-20 15:14:23 +10:00
Rohan Mitchell
b8d0e3f49a
OrderPopulator decorator checks cart contents against order cycle as well as distributor
2013-06-20 15:13:59 +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
65af89c962
ignore new rvm files
2013-06-20 11:48:22 +10:00
Rohan Mitchell
12fb43e268
DistributionChangeValidator returns an empty array when distributor and order cycle are both nil
2013-06-17 16:01:10 +10:00
Rohan Mitchell
1d977de328
Order validation performed over both product distribution and order cycle distribution
2013-06-17 15:06:41 +10:00
Rohan Mitchell
705af41684
DistributionChangeValidator finds variants distributed by product distribution when order cycle is nil
2013-06-17 15:06:20 +10:00
Rohan Mitchell
be29974dd8
DistributionChangeValidator checks if an order can change to a specified new distributION
2013-06-17 15:00:19 +10:00
Rohan Mitchell
27b5dc071a
Order cycle reports on the variants distributed by a particular distributor
2013-06-17 14:58:13 +10:00
Rohan Mitchell
17103a8b0c
Remove DistributionChangeValidator#can_change_distributor? method
2013-06-17 14:00:39 +10:00
Rohan Mitchell
da02cb5a93
Reorder specs
2013-06-17 12:05:46 +10:00
Rohan Mitchell
a355a09a7c
Disable distributor change in checkout until it takes order cycles into account
2013-06-17 11:45:23 +10:00
Rohan Mitchell
b5479380b6
Refactor alternative distributors at checkout form, fixing indentation and removed double negatives
2013-06-17 11:41:35 +10:00
Rohan Mitchell
6d22f56c86
Distribution selection form is not shown when there are products in the cart.
...
This form doesn't filter options based on which can supply the products in the cart,
so don't show it in those circumstances.
2013-06-17 11:29:36 +10:00
Rohan Mitchell
95de78f24e
Tidy-ups
2013-06-17 10:03:00 +10:00
Rohan Mitchell
bfe8184b6a
Reload order before setting variant attributes, fixes group buy
2013-06-17 10:02:49 +10:00
David Cook
1a9fd4a9a8
Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb into supplied-active-products-on-hand
2013-06-14 17:40:12 +10:00
David Cook
7933dea611
WIP: add more tests
2013-06-14 17:38:51 +10:00
David Cook
7ce7107c6c
Add meaningfull ids and classnames
2013-06-14 17:37:44 +10:00
David Cook
1abc0dac68
rename vars again
2013-06-14 17:36:38 +10:00
Rohan Mitchell
065ea6a1a1
Remove controller specs that are now covered by OrderPopulator
2013-06-14 14:57:31 +10:00
Rohan Mitchell
4e5f0b9963
Set potential distributor and order cycle before attempting add to cart, revert on failure
2013-06-14 14:57:08 +10:00
Rohan Mitchell
772d01abf7
Merge branch 'favicon'
2013-06-14 12:22:51 +10:00
Rohan Mitchell
063d760047
Merge branch 'master' into supplied-active-products-on-hand
2013-06-14 11:07:24 +10:00
Rohan Mitchell
26c3b80e87
Reverse unintentional changes to database.yml and db/schema.rb
2013-06-14 11:05:56 +10:00
David Cook
1a06b53b21
More verbose sign in error message
2013-06-13 16:29:45 +10:00
David Cook
203232de27
Disable as this has now been incorporated into move_save_checkout_button
2013-06-13 12:30:35 +10:00
David Cook
aa468140ac
Move save/process button to side on checkout pages
2013-06-13 12:29:34 +10:00
Rohan Mitchell
5e120b35aa
Ensure orders controller decorator is loaded, fixes home controller test failures
2013-06-13 07:57:03 +10:00
David Cook
30253ffd07
align actions column left for better usability
2013-06-12 15:51:07 +10:00
David Cook
017275f40e
fix error when order has no payments (ie not yet complete)
2013-06-12 15:40:36 +10:00
David Cook
7381163023
test for cancelled orders in order and distributor report
2013-06-12 15:19:45 +10:00
David Cook
ea3922a023
filter out cancelled orders from the reports
2013-06-12 15:19:14 +10:00
David Cook
415de37a6a
WIP for order spec
2013-06-12 13:33:15 +10:00
David Cook
cf4582c08e
Create respond_override to return user back to the referring page. (But it breaks payments#create respond_with..)
2013-06-12 11:24:49 +10:00
David Cook
2b15f92ab8
fix capture button to link to latest payment
2013-06-12 09:58:44 +10:00
David Cook
269c6ac14f
Use CSS substring selector for selecting Capture link by order number
2013-06-11 17:16:37 +10:00
David Cook
ada95183a2
Start respond_override
2013-06-11 17:09:41 +10:00
David Cook
fb25946acd
Start to write a test spec.. (not complete)
2013-06-11 17:00:07 +10:00
David Cook
df769a2f4c
ensure latest 'payment' object is used for the capture button
2013-06-11 16:57:14 +10:00
David Cook
4967093b72
Add capture button and resize columns
2013-06-11 15:07:41 +10:00
Rohan Mitchell
71ee764d65
Fix travis fails - set deployment before requiring gems, race condition in distributor info spec
2013-06-07 17:08:55 +10:00
Rohan Mitchell
cbeffaced1
Configure Travis, remove spork, add simplecov, add turbo sprokets.
...
Add travis config
(cherry picked from commit e3fdb12289 )
Only build on Ruby 1.9.3
(cherry picked from commit 719ef386bf )
Exclude pry from CI build
(cherry picked from commit d60935c800 )
Conflicts:
Gemfile
Attempt 2
(cherry picked from commit 2b19253895 )
Conflicts:
Gemfile.lock
Configure travis for postgres
(cherry picked from commit 3a441cd7d9 )
Fix migrations that fail because of coupling to changed/removed models
(cherry picked from commit b030793f15 )
Set up xvfb for Travis
(cherry picked from commit cdc3ab09a1 )
Add a failing test to test travis
(cherry picked from commit 72aa8fe5e5 )
Revert "Add a failing test to test travis"
This reverts commit 72aa8fe5e5 .
(cherry picked from commit bd5533e2b1 )
Add simplecov
(cherry picked from commit 5089d3bb22 )
Conflicts:
Gemfile.lock
Add turbo sprockets for faster asset precompile
(cherry picked from commit 3e6c56a638 )
Remove spork
(cherry picked from commit ed7bded642 )
Conflicts:
spec/spec_helper.rb
Remove more spork-specific things, remove unused cuc config from zeus
(cherry picked from commit fa11ff8982 )
Ensure order decorator is required, fix test fragility
(cherry picked from commit 1e94f88c5e )
2013-06-07 16:23:24 +10:00
Rohan Mitchell
1e94f88c5e
Ensure order decorator is required, fix test fragility
2013-06-07 15:40:03 +10:00
Rohan Mitchell
1e0491e90f
Add spec for OrderPopulator#check_variant_available_under_distributor
2013-06-05 16:00:17 +10:00
Rohan Mitchell
e90077bb09
Add spec for OrderPopulator#order_cycle_required_for
2013-06-05 15:54:45 +10:00
Rohan Mitchell
4bcae29553
Add specs for OrderPopulator#check_distribution_provided_for and distribution_provided_for
2013-06-05 15:50:20 +10:00
Rohan Mitchell
f4df69765d
Add spec for OrderPopulator#distributor_can_supply_products_in_cart
2013-06-05 15:09:11 +10:00
Rohan Mitchell
3724a67d16
Add spec for OrderPopulator#set_cart_distributor_and_order_cycle
2013-06-05 15:04:42 +10:00
Rohan Mitchell
bfc300a3c2
Add spec for OrderPopulator#load_distributor_and_order_cycle
2013-06-05 15:01:52 +10:00
Rohan Mitchell
437da7425c
Add spec for OrderPopulator#attempt_cart_add
2013-06-05 14:55:56 +10:00
Rohan Mitchell
fb4f533976
Refactor OrderPopulator, add outside level spec
2013-06-05 14:44:57 +10:00
Rohan Mitchell
98f3197c08
WIP Move orders#populate logic to OrderPopulator class
2013-06-05 11:47:47 +10:00
Rohan Mitchell
6670c9543b
Remove spork
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-04 14:04:26 +10:00
Rohan Mitchell
f91e1144e0
Name blank order cycle option
2013-06-04 11:11:13 +10:00
Rohan Mitchell
661ce4e597
Add to cart page does not allow the user to add a product from an order cycle that cannot supply the cart's products
2013-06-04 10:26:13 +10:00
Rohan Mitchell
249e1e013f
Slight wording change to confirmation email
2013-06-04 09:11:49 +10:00
Rohan Mitchell
ed067be530
Do not set site name and logo URLs in initializer, so that they can be set through admin interface
2013-06-04 08:43:35 +10:00
Rohan Mitchell
cb703c2a66
Do not give order cycle choice when there is only one option
2013-05-28 16:35:39 +10:00
Rohan Mitchell
54fe63e7f3
User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor
2013-05-28 16:20:58 +10:00
Rohan Mitchell
1f9f5efb79
Add first product to cart with order cycle choice
2013-05-28 14:06:52 +10:00
Rohan Mitchell
9ef7da1339
Add OrderCycle#distributed_variants
2013-05-28 14:01:04 +10:00
Rohan Mitchell
fbac41b060
Add DistributionChangeValidator#available_order_cycles, analagous to available_distributors
2013-05-28 13:51:52 +10:00
Rohan Mitchell
fb5c050b48
Refactor DistributionChangeValidator#available_distributors specs
2013-05-28 13:44:17 +10:00
Rohan Mitchell
11755346ce
DistributionChangeValidator finds available order cycles for a product
2013-05-28 13:40:13 +10:00
Rohan Mitchell
3bedfc3d1d
Add OrderCycle distributing_product scope
2013-05-28 13:27:52 +10:00
Rohan Mitchell
46fd94eded
Fix minor test fail
2013-05-28 13:01:48 +10:00
Rohan Mitchell
1b25364160
Cherry-pick c3b2f52: Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement
...
Conflicts:
app/models/enterprise.rb
lib/open_food_web/distribution_change_validator.rb
2013-05-28 13:01:07 +10:00
Rohan Mitchell
0e08829a29
Rename DistributorChangeValidator to DistributionChangeValidator in preparation for expansion to include order cycles
2013-05-28 12:32:52 +10:00
Rohan Mitchell
02561ee252
With order cycle distribution, show error message when adding a product to cart with no distribution chosen
2013-05-28 11:54:46 +10:00
Rohan Mitchell
881bceb4d1
Fill in some missing / incorrect test cases for add to cart
2013-05-27 18:40:06 +10:00
Rohan Mitchell
7b332d0f53
Re-group add to cart specs
2013-05-27 18:12:59 +10:00
Rohan Mitchell
a2abcaf7bd
Push product_compatible_with_current_order and available_distributors_for down to DistributorChangeValidator, add tests
2013-05-27 13:50:33 +10:00
Rohan Mitchell
612e6aed2c
Include order cycle distributions in distributor choice when adding product to cart
2013-05-27 13:12:29 +10:00
Rohan Mitchell
a21783c814
Allow changing distributor when there are alternate distributors available that can service the cart's order
2013-05-27 13:11:30 +10:00
Rohan Mitchell
e3a419993c
Work around order cycles not having fees / shipping methods yet - notify bugsnag and provide an undefined shipping method
2013-05-27 13:00:12 +10:00
Rohan Mitchell
796be2ee6d
Refactor add to cart form into partials and helpers
2013-05-27 11:25:09 +10:00
David Cook
0f8cd4705a
Regenerate favicon.ico from higher quality image
2013-05-24 10:14:40 +10:00
David Cook
731cf33f86
Add new favicon.ico file with size 16, 32 and 64
2013-05-22 16:21:13 +10:00
David Cook
423bd52fd6
rename _count vars to _total
2013-05-22 14:03:51 +10:00
vagrant
4e7f966429
add suppliers scope, limit by 5, test
2013-05-22 13:07:30 +10:00
vagrant
aa85d20173
add suppliers scope, limit by 5, test
2013-05-22 13:06:24 +10:00
Rohan Mitchell
6fd13212f5
Remove HTML entities from order confirmation email
2013-05-21 17:44:34 +10:00
Rohan Mitchell
c3b2f52b7a
Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement
2013-05-20 21:16:43 +10:00
Rohan Mitchell
f19ef4ed07
Move save button back within form, fix failing test
2013-05-20 16:05:25 +10:00
Rohan Mitchell
3b2508dad3
On local organics checkout, remove distributor change, move save button to top right
2013-05-20 15:29:13 +10:00
Rohan Mitchell
cc2e8694f0
Move LineItem update to source of change (order update). On empty cart, re-instanciate shipping method adjustment, fixing no shipping fees after empty cart bug.
2013-05-20 15:01:04 +10:00
Rohan Mitchell
571dfd9e9f
Regroup OrderController methods - actions / callbacks / utils
2013-05-20 14:56:39 +10:00
Rohan Mitchell
b7f7766893
On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME
2013-05-18 19:54:27 +10:00
Rohan Mitchell
d65dda4dc5
When order distributor changes, update line item shipping method
2013-05-18 19:21:01 +10:00
Andrew Spinks
174d7fac6f
Increase unicorn timeout so that reports can run over long date range.
2013-05-05 18:42:42 +10:00
Andrew Spinks
df7dd557b5
Update CMS configuration take S3 details from the spree config.
2013-05-05 14:20:57 +10:00
Andrew Spinks
88508c254b
Install db2fog for S3 database backups
...
Conflicts:
Gemfile.lock
2013-05-05 14:19:56 +10:00
Andrew Spinks
6777a3ce58
Update CMS configuration take S3 details from the spree config.
2013-05-05 14:10:11 +10:00
Rohan Mitchell
a1f189627b
Only show UserVoice feedback button on Eaterprises deployment
2013-04-29 16:34:19 +10:00
Rohan Mitchell
da3267a302
Add OpenFoodWeb logo to footer
2013-04-29 16:20:26 +10:00
Rohan Mitchell
234b2d26e9
Add MiGS payment gateway
2013-04-29 15:37:48 +10:00
Rohan Mitchell
e20e4950bb
Install db2fog for S3 database backups
2013-04-29 11:31:01 +10:00
Rohan Mitchell
06c285689e
Order confirmation email contains distributor info
2013-04-29 11:14:00 +10:00
Rohan Mitchell
50f3455523
Fix gemspec
2013-04-26 16:55:30 +10:00
Rohan Mitchell
89b749fe95
Add terms and conditions to footer
2013-04-26 16:31:33 +10:00
Rohan Mitchell
92a7f19ff1
Add specs for enterprises distributor info as rich text feature
2013-04-26 15:43:13 +10:00
Rohan Mitchell
63768df3d7
Replace distributor info box on product details and checkout pages with rich text field
2013-04-26 13:30:21 +10:00
Rohan Mitchell
fb999732ee
Rename enterprises admin extended description to profile info, add distributor info field
2013-04-26 13:10:32 +10:00
Rohan Mitchell
08161ece61
Remove sample defaces
2013-04-26 13:09:32 +10:00
Rohan Mitchell
1b6bf6ca2b
Add distributor info field to enterprises
2013-04-26 12:31:19 +10:00
Rohan Mitchell
4900129511
Enable feature for local organics only
2013-04-26 12:31:11 +10:00
Rohan Mitchell
953fe22d4c
Add new feature for rich text distributor info for enterprises
2013-04-26 12:27:15 +10:00
Rohan Mitchell
2379861c92
Shrink local organics local/remote product heading
2013-04-26 10:16:51 +10:00
Rohan Mitchell
f17907e06f
Style local organics product details distributor heading
2013-04-26 09:56:16 +10:00
Rohan Mitchell
7911adab6a
Update local organics product listing style
2013-04-26 09:47:20 +10:00
Rohan Mitchell
06364ec759
Increase local organics font size, change local products background colour
2013-04-26 09:42:50 +10:00
Rohan Mitchell
ea0df511cc
Enlarge local organics sidebar font
2013-04-26 09:23:42 +10:00
Rohan Mitchell
9909261c8c
Update local organics logo
2013-04-26 09:18:47 +10:00
Rohan Mitchell
4730ba0734
Restore display of admin top-right menu
2013-04-25 21:52:10 +10:00
Rohan Mitchell
9f6d1a2f18
Order cycle reports are precise to time of day, not just date
2013-04-25 21:22:26 +10:00
Rohan Mitchell
cea2089768
Add empty admin.js, fixes asset not precompiled error
2013-04-25 15:50:41 +10:00
Rohan Mitchell
bea247e64d
Only configure sass load paths if sass defined. Fixes production init.
2013-04-25 15:31:32 +10:00
Rohan Mitchell
0da57f1d6c
Remove spree_heroku - S3 support is now built into Spree
2013-04-23 07:32:23 +10:00
Rohan Mitchell
8f6cc361cc
Precompile all engine-specific assets
2013-04-22 18:34:11 +10:00
Rohan Mitchell
9e60e6269e
Remove unneeded variables override file
2013-04-22 18:33:53 +10:00
Rohan Mitchell
139188e021
Turn on asset init on precompile - now precompile can find assets stored in engines (lib/chili/...), but this breaks Heroku deployment
2013-04-22 17:37:02 +10:00
Rohan Mitchell
3df2207664
Remove non-present files from gemspecs
2013-04-22 17:36:18 +10:00
Rohan Mitchell
7bee04e5f6
Update selenium-webdriver, test with eaterprises deployment settings by default
2013-04-22 16:48:49 +10:00
Rohan Mitchell
3db23393d2
Scope admin css to admin section, add simple styling for front-end
2013-04-22 16:23:30 +10:00
Rohan Mitchell
27d7a2c6c2
Remove example deface, update README with licence
2013-04-22 16:14:52 +10:00
Rohan Mitchell
3dd4e074fc
Split spree variable changes into per-feature files, add an eaterprises feature for default layout
2013-04-22 16:12:50 +10:00
Rohan Mitchell
a90f060b28
Add local organics logo
2013-04-22 10:49:37 +10:00
Rohan Mitchell
3bd766eab9
Update local organics feature readme
2013-04-22 10:32:23 +10:00
Rohan Mitchell
3d8d8ecd49
Move assets deface to correct directory
2013-04-22 10:32:09 +10:00
Rohan Mitchell
a4bdea4d5c
Add chili feature for local organics
2013-04-22 10:29:05 +10:00
Rohan Mitchell
cbef31f619
Install chili for feature toggles
2013-04-22 10:24:17 +10:00
Rohan Mitchell
dc54be992b
Require spree support file that provides a default shipping method for ProductDistributions when building from factory - fixes product seeds
2013-04-21 08:54:32 +10:00
Rohan Mitchell
8f682a6d07
Unicorn handle forked db connections - fixes PG::Error SSL SYSCALL error: EOF detected
2013-04-19 09:52:16 +10:00
Rohan Mitchell
c5e8ac6fd1
Newrelic unicorn compatibility
2013-04-19 09:39:54 +10:00
Rohan Mitchell
3e2d31d432
spree-last-address repo deleted - use mirror
...
Conflicts:
Gemfile
Gemfile.lock
2013-04-19 09:27:40 +10:00
Rohan Mitchell
4ce7525748
Configure newrelic for performance monitoring
2013-04-19 09:20:59 +10:00
Rohan Mitchell
ff9200ebb8
Display order cycle distributors on product details page
2013-04-12 13:18:40 +10:00
Rohan Mitchell
6e7ee6481d
Fetch enterprises that are distributing a product via a product or order cycle distribution
2013-04-12 10:13:04 +10:00
Rohan Mitchell
32629a27e7
Remove explicit class specification
2013-04-05 16:57:53 +11:00
Rohan Mitchell
f66ff0f8b1
Rename Enterprise#available_variants to distributed_variants to remove ambiguity between supplied/distributed variants
2013-04-05 16:51:51 +11:00
Rohan Mitchell
5649a50e28
Add tests around Enterprise#available_variants, make it also show variants distributed via an order cycle
2013-04-05 16:49:27 +11:00
Rohan Mitchell
3cceb0a7b0
Ignore app/public
2013-04-05 16:48:38 +11:00
Rohan Mitchell
fa11ff8982
Remove more spork-specific things, remove unused cuc config from zeus
2013-04-05 15:25:46 +11:00
Rohan Mitchell
ed7bded642
Remove spork
2013-04-05 15:16:54 +11:00
Rohan Mitchell
02b524bfce
Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle
2013-04-05 15:00:42 +11:00
Rohan Mitchell
990931e006
Test splitting the product listing by local/remote order cycle
2013-04-05 14:32:23 +11:00
Rohan Mitchell
ad32147576
Display correct product splitting criteria
2013-04-05 14:30:35 +11:00
Rohan Mitchell
0874f12797
Controllers provide current order cycle for product splitting
2013-04-05 14:30:11 +11:00
Rohan Mitchell
661b7da110
Booleanise all the logic
2013-04-05 14:14:12 +11:00
Rohan Mitchell
f95c6a2386
Extract stub building into private method
2013-04-05 14:11:31 +11:00
Rohan Mitchell
e735a709bf
SplitProductsByDistribution deals with order cycles, and is tested by stubs
2013-04-05 14:05:30 +11:00
Rohan Mitchell
3aa48907a6
Add per-product tests for membership of distributor or order cycle
2013-04-05 12:45:01 +11:00
Rohan Mitchell
cf4fe269d1
Add specs for splitting products by various distribution options
2013-04-05 11:41:37 +11:00
Rohan Mitchell
f8ebb0c715
Rename split partial and update overrides
2013-04-05 11:34:03 +11:00
Rohan Mitchell
a11f36e121
Provide pry in test env when we're not building with Travis
2013-04-05 11:30:26 +11:00
Rohan Mitchell
11ac0a1277
Fix order cycle selection on products page
2013-04-05 11:26:47 +11:00
Rohan Mitchell
b3976bfbd0
Rename SplitProductsByDistributor to SplitProductsByDistribution
2013-04-05 11:08:19 +11:00
Rohan Mitchell
7cc24f7340
Handle the case where we're viewing a product from a remote distributor that we can change to
2013-04-05 10:28:08 +11:00
Rohan Mitchell
c681750698
Move distributor/OC browsing into its own acceptance spec
2013-03-27 11:58:38 +11:00
Rohan Mitchell
f6c76ef8ad
Update pry
2013-03-27 11:57:42 +11:00
Rob H
5544ccb94e
Merge branch 'master', remote-tracking branch 'origin'
2013-03-27 10:42:05 +11:00
Rohan Mitchell
3e6c56a638
Add turbo sprockets for faster asset precompile
2013-03-16 13:08:14 +11:00
Rohan Mitchell
1d7cf4436a
Add comments linking areas concerned with separating products by distributor and order cycle
2013-03-15 17:02:54 +11:00
Rohan Mitchell
81b65efb29
Update selenium-webdriver
2013-03-15 16:58:22 +11:00
Rohan Mitchell
a9a58db137
Add spec for viewing product counts when both a distributor and an order cycle are selected, scope Spree::Product.with_order_cycles_outer joins to avoid clash when using both in_distributor and in_order_cycle in the same query
2013-03-15 12:17:29 +11:00
Rohan Mitchell
f349628202
Test that products by ProductDistribution are not shown
2013-03-15 11:41:58 +11:00
Rohan Mitchell
5089d3bb22
Add simplecov
2013-03-11 10:57:14 +11:00
Rohan Mitchell
bcd545c13f
Alias spree_variants join to avoid name clash when loading products for home page
2013-03-08 17:21:18 +11:00
Rohan Mitchell
955f313abc
Remove require for queries_product_distribution
2013-03-08 16:59:47 +11:00
Rohan Mitchell
711f769bcd
Remove QueriesProductDistribution - replaced by Product and Enterprise scopes
2013-03-08 16:57:54 +11:00
Rohan Mitchell
c9d1573049
Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors
2013-03-08 16:56:58 +11:00
Rohan Mitchell
b25dcaa92b
Enterprise.active_distributors doesn't show distributors from inactive order cycles
2013-03-08 16:54:22 +11:00
Rohan Mitchell
2a890f80f4
Enterprise.active_distributors doesn't show distributors of out of stock products
2013-03-08 16:48:35 +11:00
Rohan Mitchell
13abf9ada7
Enterprise.active_distributors doesn't show distributors of unavailable products
2013-03-08 16:46:25 +11:00
Rohan Mitchell
cd61bad0b9
Enterprise.active_distributors doesn't show distributors of deleted products
2013-03-08 16:43:45 +11:00
Rohan Mitchell
00d7fcbfb6
Enterprise.active_distributors finds active distributors by order cycles
2013-03-08 16:39:42 +11:00
Rohan Mitchell
977344e279
Rewrite scope with outer join
2013-03-08 16:31:54 +11:00
Rohan Mitchell
98cad56e7c
Enterprise.active_distributors finds active distributors by product distributions
2013-03-08 16:23:45 +11:00
Rohan Mitchell
4b642f8c90
Convert to 1.9 hash syntax
2013-03-08 15:18:53 +11:00
Rohan Mitchell
43843f05b1
WIP: Add edge case tests
2013-03-08 15:18:53 +11:00
Rohan Mitchell
d02e8fece5
WIP: Spec that no duplicates are shown
2013-03-08 15:18:53 +11:00
Rohan Mitchell
dd3c72199a
WIP: Add spec for in_order_cycle
2013-03-08 15:18:53 +11:00
Rohan Mitchell
6d6390b886
WIP: Spec in_supplier_or_distributor
2013-03-08 15:18:53 +11:00
Rohan Mitchell
5c64e18360
WIP: Refactor tests - positive and negative into single cases for easier managability
2013-03-08 15:18:53 +11:00
Rohan Mitchell
29a9526b3f
WIP: Add spec for in_distributor
2013-03-08 15:18:53 +11:00
Rohan Mitchell
8e1c9e7bcc
WIP: Add notes, put in Spree module, write in_supplier scope spec
2013-03-08 15:18:53 +11:00
Rohan Mitchell
69392100f9
Push QueriesProductDistribution.products_available_for back to model
2013-03-08 15:18:53 +11:00
Rohan Mitchell
e326e590db
Implement and use scopes for finding products by distributor via order cycle or product distribution
2013-03-08 15:18:53 +11:00
Rohan Mitchell
265336b70c
When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles
2013-03-08 15:18:53 +11:00
Rohan Mitchell
1285d507eb
Revert "Create order cycles where needed by tests"
...
This reverts commit b82e0007c9b0322e85e5597634628024e839d102.
Conflicts:
spec/factories.rb
spec/features/consumer/order_cycles_spec.rb
2013-03-08 15:18:53 +11:00
Rohan Mitchell
884dbd5de6
Keep old methods available for product distribution queries
2013-03-08 15:18:52 +11:00
Rohan Mitchell
ebf1c8602f
Write new query for Product#in_distributor that queries order cycles instead of product_distributions
2013-03-08 15:18:52 +11:00
Rohan Mitchell
dfa94b88aa
Display distributor and order cycle choice
2013-03-08 15:18:52 +11:00
Rohan Mitchell
fcb1701d36
WIP Add hub and order cycle display stub with failing tests
2013-03-08 15:18:52 +11:00
Rohan Mitchell
c0431c614f
Clean up specs, add spec for selecting both hub and OC
2013-03-08 15:18:52 +11:00
Rohan Mitchell
624a2799aa
Create order cycles where needed by tests
2013-03-08 15:18:52 +11:00
Rohan Mitchell
a5c706d694
In test, create a global shipping method, which is required when creating orders
2013-03-08 15:18:52 +11:00
Rohan Mitchell
666f110d47
Load distributor list from those in an active order cycle
2013-03-08 15:17:23 +11:00
Rohan Mitchell
3aa44c3e9a
Setting a remote distributor clears the order cycle, and vice versa
2013-03-08 15:17:23 +11:00
Rohan Mitchell
e1b2490259
Selecting an order cycle highlights valid distributor choices
2013-03-08 15:17:23 +11:00
Rohan Mitchell
74e2b70d3a
Without JS, select distributor, highlighting local order cycle choices
2013-03-08 15:17:22 +11:00
Rohan Mitchell
72a9286457
Add helper to generate a local/remote class for order cycle selection
2013-03-08 15:17:22 +11:00
Rohan Mitchell
456dfcf6db
Style distribution choice, add compass for border radius mixin
2013-03-08 15:17:22 +11:00
Rohan Mitchell
34cb8bab26
View order cycle and distributor choices
2013-03-08 15:15:15 +11:00
Rohan Mitchell
fe824c2d4e
Add order cycle active and inactive scopes
2013-03-08 15:15:15 +11:00
Rohan Mitchell
8b5aea42b8
Add deface for order cycle selection
2013-03-08 15:15:15 +11:00
Rohan Mitchell
63f3504b81
Add order cycle reference to orders
2013-03-08 15:15:15 +11:00
Rohan Mitchell
bd5533e2b1
Revert "Add a failing test to test travis"
...
This reverts commit 72aa8fe5e5 .
2013-02-24 20:22:37 +11:00
Rohan Mitchell
72aa8fe5e5
Add a failing test to test travis
2013-02-24 19:57:57 +11:00
Rohan Mitchell
cdc3ab09a1
Set up xvfb for Travis
2013-02-24 19:42:32 +11:00
Rohan Mitchell
b030793f15
Fix migrations that fail because of coupling to changed/removed models
2013-02-24 19:09:43 +11:00
Rohan Mitchell
3a441cd7d9
Configure travis for postgres
2013-02-24 18:46:31 +11:00
Rohan Mitchell
2b19253895
Attempt 2
2013-02-24 18:17:46 +11:00
Rohan Mitchell
d60935c800
Exclude pry from CI build
2013-02-24 18:05:11 +11:00
Rohan Mitchell
4bcd55959a
spree-last-address repo deleted - use mirror
2013-02-24 17:51:46 +11:00
Rohan Mitchell
719ef386bf
Only build on Ruby 1.9.3
2013-02-24 17:51:20 +11:00
Rohan Mitchell
e3fdb12289
Add travis config
2013-02-24 17:36:19 +11:00
Rohan Mitchell
b0a665aef7
Update ransack (rubygems could not find previous version)
2013-02-20 15:44:21 +11:00
Rohan Mitchell
3982b2a690
Merge branch 'new-spree'
...
Conflicts:
Gemfile.lock
2013-02-20 15:24:27 +11:00
Rob H
a59b136864
Spree 1.3 upgrade: fix final failing tests
2013-02-20 15:16:43 +11:00
Rob H
055c07a466
Add before_payment method to checkout controller (fixes issues with spree_paypal_express)
2013-02-20 14:04:10 +11:00
Rohan Mitchell
8903c13c84
Bugsnag uses SSL, notify on staging as well as production
2013-02-20 10:09:43 +11:00
Rob H
046eb256ff
Fix issues causing enterprise fee tests to break
2013-02-15 14:10:56 +11:00
Rob H
68246e08d2
Fix stack overflow error in admin shipping method test
2013-02-15 10:34:17 +11:00
Rob H
1ded1bac3f
Lengthen Capybara.default_wait_time for tests that fail due to long load time
2013-02-15 10:31:41 +11:00
Rob H
2f1a9094bf
Fix StaleObjectError in order model test
2013-02-14 16:49:28 +11:00
Rob H
2cdf458d6a
Move additional of tabs to main nav bar to defaces, rather than overriding view directly
2013-02-14 15:42:47 +11:00
Rob H
9e9199643e
Remove unneeded :partial from override
2013-02-14 15:35:50 +11:00
Rob H
c956706d78
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
2013-02-14 15:12:50 +11:00
Rob H
290f2276cd
Update cms_admin spec work after Spree 1.3 upgrade broke it
2013-02-14 14:03:14 +11:00
Rob H
b924b0c817
Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3)
2013-02-14 12:24:01 +11:00
Rob H
d7c2bdfe22
Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3)
2013-02-14 12:12:19 +11:00
Rob H
a3746c6c59
Add analytics helper to Enterprises Controller
2013-02-14 12:10:31 +11:00
Rohan Mitchell
7cc1c97c53
Upgrade spree to 1.1.6beta
2013-02-12 09:18:50 +11:00
Rohan Mitchell
ccfe6bc0b3
Update bugsnag
2013-02-12 09:11:38 +11:00
Andrew Spinks
5e2fbcb874
Add script to sanitize order and user data.
2013-02-10 16:54:39 +11:00
Rob H
1d4fbe865b
Finished revision of defaces
2013-02-09 00:40:34 +11:00
Rob H
c517469662
Added down method to remove_display_on_from_payment_methods migration
2013-02-07 22:54:07 +11:00
Rob H
1ead1dadaf
Upgrade database to Spree 1.3
2013-02-07 15:58:15 +11:00
Rob H
109d5cfe67
Upgrade database to Spree 1.2
2013-02-07 15:34:00 +11:00
Rob H
62d6745f02
Rollback all Spree 1.3 migrations (forgot db/schema.rb)
2013-02-07 15:24:59 +11:00
Rob H
bdea85d1b4
Rollback all Spree 1.3 migrations
2013-02-07 15:24:17 +11:00
Rob H
2a07d61e81
Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue
2013-02-07 15:09:25 +11:00
Rob H
99b4530db2
WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name
2013-02-07 13:07:14 +11:00
Rob H
3507c5414d
Changed Sass variable: back to our green colour following upgrade
2013-02-07 09:25:29 +11:00
Rob H
4b254a5529
WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name
2013-02-06 11:25:26 +11:00
Rob H
612017f143
WIP Upgrade to Spree 1.3
2013-02-05 15:01:45 +11:00
Rob H
e559870189
Merge remote-tracking branch 'origin/master'
2013-02-01 13:15:25 +11:00
Rohan Mitchell
5b22cce950
Remove sleeps from specs
2013-01-22 12:12:29 +11:00
Rohan Mitchell
fec81b7ed4
Fix failing specs after merge
2013-01-22 11:34:43 +11:00
Rohan Mitchell
f2f3bbd3ed
Merge branch 'order-cycles-exchange-products'
...
Conflicts:
Gemfile.lock
2013-01-22 10:40:56 +11:00
Rohan Mitchell
83e3c6815d
Merge branch 'checkout-changes'
...
Conflicts:
.rvmrc
app/helpers/application_helper.rb
2013-01-22 10:30:51 +11:00
Rohan Mitchell
3f71655bd1
Test updating collection details
2013-01-22 09:44:19 +11:00
Rohan Mitchell
662aaf75bf
When editing an order cycle, distributor collection details are loaded
2013-01-22 09:34:07 +11:00
Rob H
f7890bd94d
Fixes following code review for checkout changes
2013-01-18 19:17:55 +11:00
Rob H
6a45e8be3b
Make tests pass after changes to checkout broke them all
2013-01-18 15:29:36 +11:00
Rohan Mitchell
c75738893e
Display supplier name on products for distribution
2013-01-18 14:35:06 +11:00
Rohan Mitchell
074d5715e7
Only provide distributors as coordinating enterprises. Order by name.
2013-01-18 14:26:56 +11:00
Rohan Mitchell
87d5ffeee2
Add fields for outgoing exchange collection details
2013-01-18 14:24:17 +11:00
Rohan Mitchell
9a03a58d9e
Change exchange pickup time from datetime to string
2013-01-18 14:23:58 +11:00
Rohan Mitchell
ae93d02c9c
OrderCycleFormApplicator applies outgoing exchange collection details
2013-01-18 14:23:42 +11:00
Rohan Mitchell
d8a7570a61
Display accurate counts for distributed products
2013-01-18 12:21:35 +11:00
Rohan Mitchell
a293ea54f9
Update saves distributors and distributed products
2013-01-18 12:13:13 +11:00
Rohan Mitchell
33b9d45f43
Distributors and products displayed on edit
2013-01-18 11:59:32 +11:00
Rohan Mitchell
0a2ce30bb6
Only show variants for distribution that are supplied to the order cycle
2013-01-18 11:52:01 +11:00
Rohan Mitchell
1a0ef85030
Test distributor exchanges are created with order cycles
2013-01-18 11:40:36 +11:00
Rohan Mitchell
983ba92dea
OrderCycleFormApplicator deals with outgoing exchanges
2013-01-18 11:22:42 +11:00
Rohan Mitchell
487247f6e7
Upgrade selenium-webdriver, fixes testing in new firefox
2013-01-18 09:35:29 +11:00
Rohan Mitchell
05c9a189c8
Merge branch 'email-changes'
2013-01-17 16:09:25 +11:00
Rohan Mitchell
43a1cf7779
Merge branch 'product-quantity-fix'
2013-01-17 16:07:55 +11:00
Rohan Mitchell
12dad2468d
Reorder specs
2013-01-17 15:13:41 +11:00
Rohan Mitchell
8f17df0e45
Name exchange elements independently
2013-01-17 11:36:56 +11:00
Rohan Mitchell
8e9845be12
Functionalise
2013-01-17 11:03:15 +11:00
Rohan Mitchell
3991199c30
Only show products for distribution that have been supplied to the order cycle
2013-01-17 10:49:59 +11:00
Rohan Mitchell
8f05c69696
Display all supplied products for distribution
2013-01-15 12:31:57 +11:00
Rohan Mitchell
f3f0f37716
Return to indexing for exchanges - this way new entries without an id get an index
2013-01-15 12:21:57 +11:00
Rohan Mitchell
850d65958b
Build Enterprise.supplied_products, an array of all products supplied by any enterprise
2013-01-15 12:21:13 +11:00
Rohan Mitchell
488fc2d60e
Upgrade capybara, spec/requests changed to spec/features
2013-01-15 10:10:24 +11:00
Rohan Mitchell
a10eb0d0c7
List and add distributor exchanges
2013-01-11 15:53:51 +11:00
Rohan Mitchell
9e59dead07
Tidy up coffee
2013-01-11 15:52:45 +11:00
Rohan Mitchell
d3fca565a3
Fix file naming and controller definition/testing
2013-01-11 14:09:56 +11:00
Rohan Mitchell
f971958042
Port order cycles js to coffeescript
2013-01-11 13:39:26 +11:00
Rohan Mitchell
3e06220b7f
WIP: Rename order_cycle to coffee
2013-01-11 10:57:02 +11:00
Rohan Mitchell
3694321f66
Use angular's extend instead of jquery's
2013-01-11 10:54:53 +11:00
Rohan Mitchell
24a48a9b33
Move enterpriseTotalVariants to Enterprise service
2013-01-11 10:50:03 +11:00
Rohan Mitchell
bb13ec0e02
Rename methods
2013-01-11 10:40:56 +11:00
Rohan Mitchell
d3189e333b
Count selected variants on an exchange
2013-01-11 10:36:27 +11:00
Rohan Mitchell
a9fb10b0ca
Do not show master selection if there are variants
2013-01-10 16:25:29 +11:00
Rohan Mitchell
3186b703a2
Apply basic styling for order cycle product selection
2013-01-10 15:57:22 +11:00
Rohan Mitchell
e46d61075e
Simplify field naming
2013-01-10 15:33:56 +11:00
Rohan Mitchell
4e78fa19a3
Add spec for updating order cycle, minor fixes
2013-01-10 15:29:13 +11:00
Rohan Mitchell
31ea8540ea
Test editing an order cycle - all data is displayed
2013-01-10 15:02:56 +11:00
Rohan Mitchell
d27ef76ead
Load exchange variants from correct attr
2013-01-10 11:27:39 +11:00
Rohan Mitchell
5129e31f21
Remove unneeded exchange_variants init
2013-01-10 11:00:09 +11:00
Rohan Mitchell
c5d031a6d7
Simplify exchange products/variants JSON output format, bind angular to this
2013-01-10 10:59:53 +11:00
Rohan Mitchell
c7d3b9ee1a
Upgrade to Rails 3.2.11
2013-01-10 09:34:52 +11:00
Rohan Mitchell
62a7a0db7c
Add spec for updating exchanges
2013-01-09 10:50:17 +11:00
Rohan Mitchell
f8c74e8b92
Make most OrderCycleFormApplicator methods private, add spec for adding exchanges
2013-01-09 10:41:09 +11:00
Rohan Mitchell
e53fff8e31
Split OrderCycleFormApplicator specs into unit / integration, add integration spec for exchange_exists?
2013-01-09 10:18:06 +11:00
Rohan Mitchell
ba19db3ccf
Add or update exchange variants when creating or updating order cycles
2013-01-09 10:06:51 +11:00
Rohan Mitchell
04297d928e
Correct naming of OrderCycleFormApplicator spec
2013-01-09 09:16:25 +11:00
Rohan Mitchell
1d357af708
Disable Jirafe and UserVoice outside of production -> test speedup
2013-01-09 09:14:43 +11:00
Rohan Mitchell
6a666dd7ec
Move preventDefault from service to controller
2013-01-08 17:51:08 +11:00
Rohan Mitchell
f705926c72
Display check boxes for products and variants, bind to model
2013-01-08 15:16:28 +11:00
Rohan Mitchell
7ae315a1cb
Remove directives test stub
2013-01-08 15:15:20 +11:00
Rohan Mitchell
836f568b8e
Display variants under products for exchange suppliers
2013-01-08 13:33:02 +11:00
Rohan Mitchell
043e67fd9d
Test adding suppliers
2013-01-08 11:58:49 +11:00
Rohan Mitchell
6ca56cbb94
Add AGPL licence
2012-12-18 15:56:54 +11:00
Rob H
ebcd5fdeed
Merge branch 'master', remote-tracking branch 'origin'
2012-12-14 15:55:04 +11:00
Rob H
63cf128f86
Remove product descriptions from line item listings in cart and order
2012-12-14 15:08:35 +11:00
Rob H
1f8b4d185b
Rearrange 'Add To Cart' section of product page
2012-12-14 14:01:13 +11:00
Rob H
c7ac0f7d91
Allow distributor to be changed from product page
2012-12-14 11:57:34 +11:00
Rob H
8a37b4e918
Push validation logic for changing distributor down into lib class
2012-12-14 11:02:01 +11:00
Rohan Mitchell
19e55428b8
Test fetching enterprises
2012-12-13 16:24:59 +11:00
Rohan Mitchell
8d8c2f04d8
Add test for removesInactiveExchanges
2012-12-13 14:55:11 +11:00
Rohan Mitchell
bec10be233
Make create test thinner
2012-12-13 14:46:07 +11:00
Rohan Mitchell
2382de946f
Test OrderCycle service create order cycle, use $window for testability
2012-12-13 14:37:35 +11:00
Rob H
fc34c9c804
Add controller level check of product count_on_hand for adding products to cart
2012-12-13 11:16:46 +11:00
Rohan Mitchell
0f5d51423b
Provide jQuery to tests, test loading an order cycle
2012-12-08 17:24:57 +11:00
Rohan Mitchell
91e3ddb93c
Begin writing test for OrderCycle service
2012-12-07 16:24:40 +11:00
Rohan Mitchell
8cfce57730
Add unit tests for AdminEditOrderCycleCtrl
2012-12-07 15:30:49 +11:00
Rob H
9c9431ca7f
Install Letter Opener for development environment
2012-12-07 14:31:23 +11:00
Rob H
3a3f427a8d
Reference name of payment method rather than payment method itself
2012-12-07 14:30:05 +11:00
Rob H
b5a95e73dc
Only show alternative distributors on 'address' page of checkout process
2012-12-07 12:29:44 +11:00
Rob H
9cf6124df3
Change checkout explanations from CMS pages to CMS snippets
2012-12-07 12:24:28 +11:00
Rob H
46abc2fc42
Add ability to change distributor based on whether products in the cart are available
2012-12-07 11:56:40 +11:00
Rohan Mitchell
0a6686b592
Add unit tests for AdminCreateOrderCycleCtrl angular controller
2012-12-05 16:09:20 +11:00
Rohan Mitchell
55423d2df1
Display all supplied products for selection
2012-12-04 15:24:11 +11:00
Rohan Mitchell
e9746ebc9b
Display exchange product names
2012-12-04 14:52:59 +11:00
Rohan Mitchell
505f33a3f7
Display variant image url in json output
2012-12-04 14:14:36 +11:00
Rohan Mitchell
1d4d7d064b
Add exchange products form, shown/hidden by button press
2012-12-04 12:26:18 +11:00
Rohan Mitchell
a4d3cc5417
Display exchange variants in JSON, load data client side
2012-12-04 12:07:58 +11:00
Rohan Mitchell
3080454b25
Merge branch 'order-cycles'
2012-12-04 11:40:35 +11:00
Rohan Mitchell
cd13ab4f77
Fix failing tests
2012-12-04 11:39:39 +11:00
Rohan Mitchell
9880c45313
Perform all XHR with instead of
2012-12-04 11:07:44 +11:00
Rohan Mitchell
5afb2bb8f9
Extract Enterprise fetching into service
2012-12-04 10:51:14 +11:00
Rohan Mitchell
aefa06b67d
Edit works with service
2012-12-04 10:31:45 +11:00
Rohan Mitchell
7d84803bad
Extract OrderCycle into service, create works
2012-12-04 10:18:31 +11:00
Rohan Mitchell
fee64a5764
Datetime recognises input datetime format
2012-12-04 09:43:39 +11:00
Rohan Mitchell
34ef8a1deb
Datetime pickers interact with angular model
2012-12-04 09:38:12 +11:00
kirstenalarsen
c055a3c594
remove old rvmrc file
2012-12-03 19:31:27 +11:00
Rohan Mitchell
a0c40607ec
Bulk update order cycle opening/closing times
2012-12-02 15:43:05 +11:00
Rohan Mitchell
25a2732253
Add basic styling to order cycle edit page
2012-12-02 15:14:31 +11:00
Rohan Mitchell
97401ca370
Remove exchanges in both create and edit
2012-12-02 14:32:52 +11:00
Rohan Mitchell
71320aa977
Display correct label for submit button
2012-12-02 14:02:17 +11:00
Rohan Mitchell
8e4b729351
Load correct order cycle, prep for saving order cycle
2012-12-02 13:53:35 +11:00
Rohan Mitchell
07eac918a3
OrderCycleFormApplicator deletes removed exchanges
2012-11-30 17:08:57 +11:00
Rohan Mitchell
cfa96c7615
Each order cycle may not have duplicate exchanges between the same enterprises
2012-11-30 16:37:29 +11:00
Rohan Mitchell
5655b0b7a5
OrderCycleFormApplicator updates existing exchanges
2012-11-30 16:07:21 +11:00
Rohan Mitchell
34120730cd
Load enterprises, all data displays
2012-11-30 15:46:53 +11:00
Rohan Mitchell
31735d3d10
Add edit order cycle controller, load basic data
2012-11-30 15:44:07 +11:00
Rohan Mitchell
ba3a595af2
Output an order cycle in JSON
2012-11-30 15:43:46 +11:00
Rohan Mitchell
6e4638b12d
Upgrade angular to 1.0.3, move form to partial, use angular resource
2012-11-30 15:17:21 +11:00
Rohan Mitchell
145fed09a1
Fixy
2012-11-29 11:54:22 +11:00
Rohan Mitchell
8736254f12
Create incoming exchanges on save
2012-11-29 11:52:34 +11:00
Rohan Mitchell
2c8d313c77
Create OrderCycleFormApplicator, for interfacing between front-end form and OrderCycle exchanges model.
2012-11-29 11:40:15 +11:00
Rohan Mitchell
243e1ccd93
Add supplier to order cycle
2012-11-29 11:16:59 +11:00
Rohan Mitchell
ac66bf4871
Add client-side validation to order cycle form
2012-11-29 10:40:19 +11:00
Rohan Mitchell
64d4e405dd
Add datetimepicker for order cycle opening and closing times
2012-11-29 10:25:33 +11:00
Rohan Mitchell
aacc36ea44
Create order cycle basic fields
2012-11-29 10:02:23 +11:00
Rob H
ef22168349
Move select_distributor and deselect_distributor actions from enterprises controller to orders controller
2012-11-28 10:54:11 +11:00
Rob H
43248aee99
Add can_change_distributor validation to the Order model
2012-11-28 09:17:05 +11:00
Rohan Mitchell
a19e697556
Add header to admin enterprises page
2012-11-27 13:46:59 +11:00
Rohan Mitchell
5103ce64ba
Output new order cycle as JSON
2012-11-27 10:51:22 +11:00
Rohan Mitchell
d5310452b6
Admin list order cycles
2012-11-27 10:13:12 +11:00
Rohan Mitchell
47c28e65a7
Add detailed order cycle factory, add methods to report on order cycle suppliers, distributors and products/variants exchanged
2012-11-27 10:09:40 +11:00
Rohan Mitchell
6b97872a25
Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants
2012-11-26 11:03:44 +11:00
Rohan Mitchell
7a6d930706
Merge branch 'enterprise-fees'
2012-11-26 10:13:48 +11:00
Rohan Mitchell
7c5dcd6a90
Change angular_ prefix to ng_
2012-11-26 10:03:20 +11:00
Rohan Mitchell
6106f1b469
Calculator type change works, enterprise fee tests pass
2012-11-26 09:45:06 +11:00
Rohan Mitchell
59af447739
Fix ?
2012-11-26 09:44:42 +11:00
Rohan Mitchell
d502705362
Raise an error when using unsupported nested angular_fields_for
2012-11-24 07:50:09 +11:00
Rohan Mitchell
5ae13d6156
Order all the fees
2012-11-23 17:21:46 +11:00
Rohan Mitchell
c46b858563
Don't render teh bits we dont wants
2012-11-23 17:20:52 +11:00
Rohan Mitchell
5e0a5654ff
Correctly index calculator fields. Adds ng-bind-html-unsafe-compiled.
2012-11-23 17:02:58 +11:00
Rob H
58a79e9b0c
Minor changes to order confirm email
2012-11-23 16:06:25 +11:00
Rob H
ee482d520c
Replace order information display for Confirm and Complete stages of checkout
2012-11-23 10:51:14 +11:00
Rob H
3d025bb709
WIP Replace order information display for Confirm and Complete stages of checkout
2012-11-23 09:26:27 +11:00
Rohan Mitchell
52ebe2c495
Provide proper names for angular select fields, add angular hidden field
2012-11-22 16:38:25 +11:00
Rohan Mitchell
fd0cc93e68
Add delete link
2012-11-22 16:19:10 +11:00
Rohan Mitchell
2a645d04ae
Move presentation to presenter, display calculator fields
2012-11-22 14:37:38 +11:00
Rohan Mitchell
b7bd21e498
Full-text search of form
2012-11-22 12:15:39 +11:00
Rohan Mitchell
873937db47
angular_collection_select
2012-11-22 11:45:55 +11:00
Rohan Mitchell
e64a86f5be
angular_select
2012-11-22 11:27:51 +11:00
Rohan Mitchell
ad76e66944
angular_options_for_select
2012-11-22 11:24:05 +11:00
Rohan Mitchell
216125c7a1
Start building some selects
2012-11-22 11:03:28 +11:00
Rohan Mitchell
d6802d9ae5
Generate text field with custom form builder - AngularFormBuilder
2012-11-22 09:53:26 +11:00
Rohan Mitchell
58917fe378
Convert enterprise select and name entry into form fields
2012-11-22 08:58:08 +11:00
Rob H
2786791c39
Change location of checkout delivery page cms from /delivery to /distribution
2012-11-21 16:14:56 +11:00
Rohan Mitchell
e2b0770c35
Fix name of button in spec
2012-11-21 16:02:12 +11:00
Rob H
b34d9da8e5
Add cms field to cart page to explain cart, located at cms path: /cart
2012-11-21 16:00:51 +11:00
Rohan Mitchell
e388e82d50
Merge branch 'checkout-changes'
2012-11-21 15:15:10 +11:00
Rohan Mitchell
dd155532f8
Add angular include, basic controller for listing enterprise fees, display fee ids using angular
2012-11-21 14:59:02 +11:00
Rohan Mitchell
63ba5d13a3
Add representative, output enterprise fees as JSON
2012-11-21 14:58:29 +11:00
Rohan Mitchell
fa2addd025
Delete enterprise fee
2012-11-21 12:17:19 +11:00
Rohan Mitchell
77b78f5bbb
Edit enterprise fee
2012-11-21 11:50:37 +11:00
Rohan Mitchell
bcc2ef99fd
Ensure that AUTH_TOKEN var is set in tests, since spree's admin JS errors without it
2012-11-21 11:49:59 +11:00
Rohan Mitchell
a4d10ab4e0
Create new enterprise fee, display errors when present
2012-11-21 09:47:51 +11:00
Rohan Mitchell
ff0d2bc983
Create EnterpriseSet as subclass of ModelSet
2012-11-21 09:08:41 +11:00
Rob H
cbfb896ca4
Change 'Delivery Fees' to 'Distribution Costs' in cart
2012-11-17 11:46:43 +11:00
Rob H
59ca8f4513
Add cms field to cart page to explain delivery fees, located at cms path: /cart-delivery-fees
2012-11-16 18:32:02 +11:00
Rob H
0d99d9d18f
Don't display unit size in reports for products that are not group buy items
2012-11-16 17:00:57 +11:00
Rob H
573ba9c8d4
Merge remote-tracking branch 'origin/master' into checkout-changes
2012-11-16 16:10:51 +11:00
Rohan Mitchell
98143ffe5b
Add calculator to EnterpriseFee, test passes for listing enterprise fees
2012-11-16 16:07:40 +11:00
Rob H
32acba05a3
Fixed total row labels in bulk co-op allocation report.
2012-11-16 15:28:06 +11:00
Rohan Mitchell
6247bd2541
Display admin table of enterprise fees with enterprise, fee type and name columns
2012-11-15 15:03:12 +11:00
Rohan Mitchell
03764881c8
Generalise EnterpriseSet to ModelSet
2012-11-15 14:29:38 +11:00
Rohan Mitchell
ec74396659
Add enterprise fees to admin configurations menu
2012-11-15 13:58:51 +11:00
Rohan Mitchell
192d4993a1
Add EnterpriseFee model
2012-11-15 13:42:55 +11:00
Rob H
9cb5ac95ff
More brackets make everything even better
2012-11-11 15:30:01 +11:00
Rohan Mitchell
076c64f7b0
Brackets make everything better
2012-11-10 12:53:03 +11:00
Rohan Mitchell
580486a347
Do not show duplicate products with in_supplier_or_distributor scope
2012-11-10 12:26:41 +11:00
Rohan Mitchell
9a9bef5304
Report filtering on completion date, not creation date
2012-11-09 20:31:08 +11:00
Rohan Mitchell
b4120b1028
Merge branch 'fixes-for-reports'
2012-11-07 19:00:07 +11:00
Rob H
a15f96aa68
Fix for case where no group_buy_size_has been set. ie. = nil
2012-11-07 18:34:54 +11:00
Rohan Mitchell
0f68ddcf01
Merge branch 'fixes-for-reports'
2012-11-07 14:30:45 +11:00
Rob H
5f07df9316
Add calculation fields to bulk co-op and order cycle reports
2012-11-03 11:36:17 +11:00
Rob H
9e4edd5da0
Change the basis of line_item grouping for Bulk Co-op and Order Cycle reports from User to Order
2012-11-02 16:41:32 +11:00
Rohan Mitchell
80159e1ea7
Do not munge foreign keys when migrating to enterprises
2012-11-02 15:34:02 +11:00
Rob H
3d2572c628
Merge branch 'master', remote-tracking branch 'origin'
2012-11-02 14:43:47 +11:00
Rohan Mitchell
3a116dc13d
Fix product filtering on supplier and distributor pages
2012-11-01 16:37:12 +11:00
Rohan Mitchell
c2133d70ac
Rename Enterprise is_supplier scope to is_primary_producer
2012-11-01 15:02:57 +11:00
Rohan Mitchell
a7a8b8490b
Add test for viewing a CMS page
2012-11-01 11:31:08 +11:00
Rohan Mitchell
8748a65031
Show role on admin enterprises listing page
2012-11-01 11:22:13 +11:00
Rohan Mitchell
6d84cf7613
Merge branch 'master' into enterprises
...
Conflicts:
app/controllers/enterprises_controller.rb
app/views/spree/checkout/_distributor.html.haml
db/schema.rb
spec/lib/open_food_web/group_buy_report_spec.rb
2012-11-01 11:02:02 +11:00
Rohan Mitchell
13d6f7213e
Fix db seeds
2012-11-01 10:21:55 +11:00
Rohan Mitchell
d89945bbb2
Add smoke test for reports, fix use of old Distributor model
2012-11-01 10:20:06 +11:00
Rohan Mitchell
78bdbcbe6f
Rename DistributorsHelper to EnterprisesHelper
2012-11-01 10:07:55 +11:00
Rohan Mitchell
682c09f516
Remove use of old Distributor model, fix before all not cleaning db
2012-11-01 10:05:39 +11:00
Rohan Mitchell
34588e6141
Remove old supplier and distributor routes, models, controllers, views, specs
2012-11-01 09:55:45 +11:00
Rohan Mitchell
d927906934
Update admin views, tests pass
2012-11-01 08:36:40 +11:00
Rohan Mitchell
58d227e76a
Home controller and product model specs pass
2012-11-01 08:28:40 +11:00
Rohan Mitchell
fb9f59213f
Distributors, product, suppliers and taxonomy specs pass
2012-11-01 08:15:50 +11:00
Rohan Mitchell
f8c2c8bbed
Convert group buy unit size field from string to float
2012-11-01 08:02:11 +11:00
Rohan Mitchell
7dd42b7feb
Fix use of pickup_address and url fields with enterprises, checkout spec passes
2012-10-31 17:10:21 +11:00
Rohan Mitchell
1b89331aa4
Update capybara and selenium-webdriver for compatibility with firefox 16
2012-10-31 17:09:26 +11:00
Rohan Mitchell
309179096b
Update supplier_id and distributor_id to point to newly created enterprises
2012-10-31 16:56:35 +11:00
Rohan Mitchell
9d5c127f0d
Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes.
2012-10-31 16:47:01 +11:00
Rohan Mitchell
a8f4178894
Update orders controller for enterprises
2012-10-31 16:33:38 +11:00
Rohan Mitchell
f03d9b66f0
Update spree_paypal_express to fail gracefully when setting address
2012-10-31 15:17:05 +11:00
Rohan Mitchell
b9a072b61a
Make sure enterprises have a valid address after pickup address field has been removed
2012-10-31 14:32:47 +11:00
Rohan Mitchell
1d1c27701d
Add admin interface for enterprises
2012-10-31 14:25:00 +11:00
Rohan Mitchell
5dcba7403b
Avoid contaminating test data
2012-10-31 13:54:14 +11:00
Rohan Mitchell
926440a978
Fix namespacing of Distributor in reports controller
2012-10-31 11:13:55 +11:00
Rohan Mitchell
9b32579bd6
Group buy report handles nil variant weight gracefully
2012-10-31 10:37:40 +11:00
Rohan Mitchell
5ac904005b
Merge branch 'order-cycle-reports'
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
config/routes.rb
2012-10-31 10:18:11 +11:00
Rohan Mitchell
077098e6c1
Refactor libs to use enterprise instead of supplier and distributor
2012-10-29 14:57:03 +11:00
Rohan Mitchell
04d8648c6d
Remove pickup address and use single address field for supplier and distributor roles within enterprise
2012-10-28 18:03:19 +11:00
Rohan Mitchell
4c2debba7e
Model specs pass
2012-10-28 18:00:15 +11:00
Rohan Mitchell
abe3feb996
Integrate functionality from distributor into enterprise
2012-10-28 17:46:45 +11:00
Rohan Mitchell
c700d9e71b
Create enterprise model, integrate functionality from supplier
2012-10-28 13:24:26 +11:00
Rohan Mitchell
ff24149195
Combine suppliers and distributors into enterprises table
2012-10-28 12:59:50 +11:00
Rohan Mitchell
03610c93de
Upgrade capybara and selenium-webdriver for compatibility with Firefox 16
2012-10-28 12:28:55 +11:00
Rohan Mitchell
c5941d6cb5
Update distributor details when distributor is changed
2012-10-27 18:50:09 +11:00
Rohan Mitchell
773adca838
Display distributor details on product page when distributor is selected
2012-10-27 12:49:57 +11:00
Rohan Mitchell
13317347bb
Display an explanation message on product page when no distributor is selected
2012-10-27 12:19:44 +11:00
Rob H
7da595afbd
Add cms field to top of delivery page of checkout, located at cms path: /delivery
2012-10-26 19:29:55 +11:00
Rob H
f960cc44ba
Fixed calculations when variant weight is nil
2012-10-26 17:27:08 +11:00
Rob H
a9293709d8
Merge branch 'master', remote-tracking branch 'origin'
2012-10-26 17:24:17 +11:00
Rohan Mitchell
a3042118c7
Merge branch 'group-reports'
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
config/routes.rb
2012-10-26 17:14:49 +11:00
Rob H
01569c2550
Change button text on Payments page to 'Process My Order'
2012-10-26 16:47:42 +11:00
Rob H
ede4649fbf
Merge branch 'master', remote-tracking branch 'origin'
2012-10-26 16:12:11 +11:00
Rob H
4dd5e12968
Fix reports controller, previous changes to fix change generate_report were incomplete
2012-10-26 13:49:39 +11:00
Rob H
d74591afe6
Fixes to reports controller and addition of order cycles reports
2012-10-26 13:44:13 +11:00
Rohan Mitchell
09b60908b8
Fix links to admin distributor edit and delete
2012-10-25 12:20:20 +11:00
Rohan Mitchell
d1b9ce92f6
Move distributors helper out of spree namespace
2012-10-25 10:45:39 +11:00
Rohan Mitchell
784969097d
Move admin non-Spree controllers out of Spree namespace
2012-10-25 10:45:39 +11:00
Rohan Mitchell
15e91f7743
WIP Move non-admin non-Spree controllers out of Spree namespace
2012-10-25 10:45:39 +11:00
Rohan Mitchell
c46019d68c
WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace
2012-10-25 10:45:39 +11:00
Rob H
a362dd5161
Change reports controller: generate_report to render_report
2012-10-24 17:01:50 +11:00
Rob H
41d547ac2d
Minor formatting changes to Order Group Spec
2012-10-24 16:13:23 +11:00
Rob H
81b33772fe
Fixes to syntax and formatting for group-reports
2012-10-24 15:21:16 +11:00
Rob H
3b855a866a
Merge branch 'grouper-reports' into group-reports
2012-10-22 11:35:56 +11:00
Rob H
eb7d69fe6b
commit routes.rb file to prevent overwriting
2012-10-22 11:35:48 +11:00
Rob H
ddb01e4ccb
WIP: Create report grouper, write reports for bulk co-ops and payments
2012-10-21 13:12:48 +11:00