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
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
Rohan Mitchell
d908701b59
Merge branch 'master' into folklabs-producer-emails
...
Conflicts:
Gemfile
2015-06-11 17:02:34 +10:00
Rohan Mitchell
5ae88dbd6c
Fix content overlapping alert
2015-06-11 14:29:49 +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
Rohan Mitchell
5175fe9a03
Make stats more accurate by excluding invisible, inactivated enterprises and incomplete orders
2015-06-11 12:53:23 +10:00
Rohan Mitchell
662330b222
Alert appears at top of page. It slides in on page load and slides out on close.
2015-06-11 12:10:50 +10:00
Rohan Mitchell
f4e0baa56a
Basic click-to-close for sell-food alert
2015-06-10 19:03:40 +10:00
Rohan Mitchell
686a54c121
Make 'selling food' alert visible, basic styling
2015-06-10 19:03:25 +10:00
Rohan Mitchell
b37f21dce1
Remove load_active_distributors call missed by merge
2015-06-10 18:38:32 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
604360034b
Make filter method private
2015-06-10 17:04:09 +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
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
Rohan Mitchell
80834a0c27
Merge branch 'master' into ginerr_bugfixes
2015-06-05 15:49:43 +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
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
