Rohan Mitchell
170799f65f
Add permission for hub enterprise users to use xero report #628
2015-08-07 13:37:37 +10:00
Continuous Integration
14900655df
Auto-merge from CI [skip ci]
2015-08-05 12:18:31 +10:00
Rohan Mitchell
be66769999
SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.
2015-08-05 11:05:29 +10:00
Rohan Mitchell
012b0517a5
Fetch order cycle variants in SQL
2015-07-31 16:57:47 +10:00
Rohan Mitchell
ec908fce92
Make TOS URL configurable
2015-07-31 14:51:17 +10:00
Rohan Mitchell
5fd3dc1d28
Customise footer logo
2015-07-17 16:24:07 +10:00
Rohan Mitchell
bb3a4170f5
Add dimensions to image upload
2015-07-17 16:06:50 +10:00
Rohan Mitchell
74f90dada3
Allow overriding mobile logo (raster and SVG) and home hero image
2015-07-17 16:06:50 +10:00
Rohan Mitchell
e4a4cdd915
Rewrite alias_method_chain to use super. Ahhhhh :)
2015-07-17 16:06:50 +10:00
Rohan Mitchell
66b4eb4c5d
Move Spree::Preferences::Configuration patches into superclass FileConfiguration
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1d67e3b2b8
Fix image update, display logo on frontend
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1234b35199
Add file handling to Spree::Preferences::Configuration
2015-07-17 16:06:49 +10:00
Rohan Mitchell
1b17a7fb35
Add logo field to ContentConfig
2015-07-17 16:06:49 +10:00
Rohan Mitchell
372b17703a
Remove unused content fields and partial
2015-07-17 16:06:49 +10:00
Rohan Mitchell
5de9a5eb54
Add config setting to enable/disable stats on home page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
bd83dde89d
Content manage group signup page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
a490d9696b
Content manage hub signup page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
d353906bb8
Content manage producer signup page
2015-07-17 16:06:49 +10:00
Lynne Davis
dc95167f15
Adding bits missed from the last commit.
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-07-15 14:44:49 +10:00
Rohan Mitchell
3f8235593a
When enterprise is deleted, delete relationships
2015-07-10 09:42:09 +10:00
Rohan Mitchell
f51a9679f2
Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:34:41 +10:00
Rohan Mitchell
173f4c0f03
Merge branch 'rob-github-fixes' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:32:55 +10:00
Rohan Mitchell
aa0a031fa0
Fetch indexed variant overrides in one go
2015-06-18 15:03:24 +10:00
Rohan Mitchell
dd2f6d6430
Extract VariantOverride fetching into ScopeVariantToHub#scope
2015-06-18 14:45:40 +10:00
Rohan Mitchell
7cc2bc4fde
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
2015-06-18 13:11:11 +10:00
Rohan Mitchell
c5526c78d9
Make enterprise name unique
2015-06-17 15:01:46 +10:00
Rohan Mitchell
470f10a828
Merge branch 'master' into rob-github-fixes
2015-06-16 19:00:54 +10:00
Rohan Mitchell
0dbecce65d
Optimise relatives including self - minor improvement
2015-06-16 17:43:13 +10:00
Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Rohan Mitchell
301a3ac090
Rename Blog link to News for consistency with global site
2015-06-16 14:53:54 +10:00
Rohan Mitchell
fd41003fb7
Change all global links to www
2015-06-16 14:47:40 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +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
795b2700b4
Merge branch 'master' into enterprise-index-revamp
2015-06-12 12:47:58 +08:00
Rohan Mitchell
2b763271a7
Merge branch 'master' into optimise-shopfront
2015-06-12 12:15:20 +10:00
Rohan Mitchell
4f311543ae
Merge branch 'master' into enterprise-index-revamp
2015-06-12 10:26:11 +10: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
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08: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
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
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
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
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
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +10:00
Rob Harrington
359328a96e
Producers and distributors lists include self where appropriate
2015-06-03 16:18:44 +08:00
