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
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
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
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
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
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
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +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
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
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
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
41b348f594
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:05:51 +10:00
Rohan Mitchell
8afffdae9a
Fix error when product does not have a master variant
2015-06-03 12:13:42 +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
