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
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
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
f324471495
Merge branch 'index_enterprise_permalink' into combined/xero-report_analytics-bugfixes
2015-06-05 14:20:13 +10: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
96177b7cd7
Add unique index to enterprise permalink
2015-06-03 11:57:22 +10:00
Maikel Linke
19448a182e
Add permalink field to enterprise groups
2015-05-28 11:27:39 +10:00
Rob Harrington
a473d0ed11
Checking in db version change
2015-05-13 15:58:03 +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
4c5e75c3f9
Adding acts-as-taggable-on gem
2015-05-13 12:44:36 +10:00
Lynne Davis
f7ade48e86
Update DB schema to store updatable weight on items sold
2015-05-09 19:10:55 +01:00
Rob Harrington
bdf462926d
Ensure that producer properties have a position
2015-04-24 13:05:01 +10:00
Rob Harrington
1f293bb787
Adding inherits properties flag to products
2015-04-22 21:02:06 +10:00
Rohan Mitchell
61cb2514cd
Add Delayed::Job
2015-04-16 16:54:43 +10:00
Rohan Mitchell
c85d5b86eb
Fix temperature_controlled migration - NOT NULL requires default value
2015-03-12 12:22:51 +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
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
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
61c08997a1
EnterpriseFee has a TaxCategory
2015-03-05 10:44:22 +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
2a8ba0bf42
Fixing merge conflicts after rebase
2015-03-03 16:12:07 +11:00
Lynne Davis
f2a35e219e
Updating migration on customers table with extra validation
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
Rohan Mitchell
f8ca24c5cd
Index enterprise_groups address_id
2015-02-20 14:56:16 +11:00
Maikel Linke
a7b723af93
owner index for enterprise groups
2015-02-19 13:23:50 +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
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
Rob Harrington
9f0aeb5adf
Adding unique permalink to enterprises
2015-01-22 10:19:41 +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
45e709b2cc
VariantOverrides require hub and variant
2014-12-12 13:33:14 +11:00
Rohan Mitchell
f9b4c07219
Add initial VariantOverride model with price lookup
2014-11-21 13:49:09 +11:00
Rob Harrington
996b2f2604
Adding 'producer_profile_only' flag to enterprises
2014-10-23 16:42:00 +11:00
Rob Harrington
82d33332ab
Adding shop_trial_start_date column to enterprises
2014-10-22 16:11:51 +11:00
Rohan Mitchell
4308f7d09c
Revert "use sql for migration"
...
This reverts commit fec8f08966
2014-10-22 09:43:10 +11:00
Rafael Schouten
fec8f08966
use sql for migration
2014-10-18 16:17:29 +11:00
Rob Harrington
e24a774d54
Adding schema
2014-10-17 16:16:17 +11:00
Rob Harrington
28807d4f4d
Merge migrate_ent_types into reg
2014-10-17 10:20:48 +11:00
Rafael Schouten
1a40c83a48
update chema with indexes
2014-10-17 07:59:51 +11:00
Rob Harrington
b8b19368df
WIP: Making enterprise emails confirmable
2014-10-10 16:54:38 +11:00
Rafael Schouten
dc7c9ea272
commit updated schema
2014-09-28 22:37:26 +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
Rob Harrington
9e2e96d19e
Schema weirdness
2014-09-16 23:45:36 +10:00
Rob H
2253859cd1
Adding enterprise limit to spree users
2014-09-11 14:54:51 +10:00
Rob H
31de5d45ea
Adding owner to enterprise
2014-09-11 14:36:09 +10:00
