Rohan Mitchell
422061f137
Merge branch 'master' into products-caching
...
Conflicts:
app/controllers/shop_controller.rb
app/models/enterprise_fee.rb
app/models/order_cycle.rb
app/models/variant_override.rb
db/schema.rb
lib/open_food_network/products_renderer.rb
spec/lib/open_food_network/products_renderer_spec.rb
2016-03-03 09:42:52 +11:00
Rob Harrington
0d65838e5d
Adding a second migration to auto-add variants to inventories
...
(I stuffed up the first one, oops)
2016-03-02 17:09:39 +11:00
Rob Harrington
8e1b4e299c
Adding column 'permission_revoked_at' to VOs
...
And a migration to flag any VOs which should not be permitted, update previous migration so that new enterprise relationships don't try to revoke variant overrides
2016-03-02 12:10:49 +11:00
Rob Harrington
51d77d5781
Adding migration to explicitly grant VO permission where it is currently implicitly granted via managers/owners
...
In preparation for removing implicitly granted permissions
2016-03-02 12:10:49 +11:00
Rob Harrington
b2657ddc72
Adding data migration to populate inventories of enterprises that are already using variant overrides
2016-03-02 12:10:49 +11:00
Rob Harrington
095b420997
WIP: Adding InventoryItem model for managing contents of inventories
2016-03-02 12:10:22 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rohan Mitchell
540687515e
Reify coordinator_fees HABTM join table as CoordinatorFee model using HMT
2016-02-24 15:05:03 +11:00
Rob Harrington
669642292b
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
2016-01-15 09:07:51 +11:00
Steve Pettitt
1d38866f86
Add migration file to git repo
2016-01-15 09:07:50 +11:00
Steve Pettitt
e423e890e0
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
2016-01-15 09:07:50 +11:00
Steve Pettitt
0ee078e232
Added toggle to enable/disable reset stock. Updated specs
2016-01-15 09:07:48 +11:00
Steve Pettitt
6c0dd7e25f
Adding 'default_stock' to VariantOverride
2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08
WIP: Adding view and routes for resetting variant_overrides count_on_hand
2016-01-15 09:07:48 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
2016-01-13 18:49:33 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Maikel Linke
c4fb4a8510
Removing Suburbs from the code
...
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
2015-12-04 10:37:55 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rob Harrington
a96cdd5ee7
Merge branch 'master' into line_item_naming
...
Conflicts:
app/views/admin/order_cycles/edit.html.haml
2015-11-13 09:54:26 +11:00
Rob Harrington
039fcb80eb
Extracting variant and option_value naming out into a lib class that is now shared between line items and variants, line_items have option_values
2015-10-28 13:06:10 +11:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rob Harrington
a71410042f
Ensuring that account invoice orders have an address
2015-10-14 14:36:37 +11:00
Rob Harrington
4a8f9d1e36
Adding reference to account_invoice for each billable_period
2015-09-17 22:38:29 +10:00
Rob Harrington
b1285cd07f
WIP: Adding AccountInvoice model to more robustly record information about enterprise user invoices
2015-09-17 22:38:28 +10:00
Rob Harrington
4d58faefd8
Adding timestamps to billable periods
2015-09-17 22:38:08 +10:00
Rob Harrington
550434dfe8
Renaming bill_items to billable_periods
2015-09-17 22:37:55 +10:00
Rob Harrington
083d7327bc
Adding BillItem to database
2015-09-17 22:37:44 +10:00
Rob Harrington
6489848eff
Adding paper_trail gem
2015-09-17 22:37:33 +10:00
Rohan Mitchell
9e1788a6b0
Apply migrations to db/schema.rb
2015-08-07 12:03:43 +10:00
Lynne Davis
8639109372
Variable weights improvements additions
2015-08-04 20:13:28 +01:00
Rohan Mitchell
c5526c78d9
Make enterprise name unique
2015-06-17 15:01:46 +10:00
Rohan Mitchell
d908701b59
Merge branch 'master' into folklabs-producer-emails
...
Conflicts:
Gemfile
2015-06-11 17:02:34 +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
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
cb2adea59f
Remove executable bit from a migration file
2015-06-03 10:16:29 +10:00
Rohan Mitchell
3dbc2e0382
Merge branch 'master' into folklabs-producer-emails
2015-05-29 17:36:11 +10:00
Continuous Integration
c14de4e97f
Auto-merge from CI [skip ci]
2015-05-29 14:29:23 +10:00
Maikel Linke
19448a182e
Add permalink field to enterprise groups
2015-05-28 11:27:39 +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
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
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
f7ade48e86
Update DB schema to store updatable weight on items sold
2015-05-09 19:10:55 +01:00
