raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,361 Commits 20 Branches 451 Tags
3b2bdb8397bb71c3fdbe09bd3cff3f4d2cfccf4d
Commit Graph

273 Commits

Author SHA1 Message Date
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
Rohan Mitchell
1531c476e3 Merge branch 'master' into require_standard_variant 
Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb
 2015-05-08 13:45:31 +10:00
Rohan Mitchell
f5b45fa0ba Merge branch 'master' into folklabs-producer-emails 2015-05-01 09:51:01 +10:00
Rohan Mitchell
6b1c125b03 Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails 
Conflicts:
	Gemfile.lock
	app/controllers/admin/order_cycles_controller.rb
	app/views/admin/order_cycles/edit.html.haml
	app/views/admin/order_cycles/show.rep
	db/schema.rb
	spec/controllers/admin/order_cycles_controller_spec.rb
 2015-04-29 14:42:17 +10:00
Rob Harrington
992fb2347d Merging master branch into require_standard_variant 2015-04-29 14:30:49 +10:00
Rohan Mitchell
c3f99d7540 Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country 2015-04-29 14:07:58 +10: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
Rob Harrington
a75a76840d Merging master into require_standard_variant 2015-04-17 21:18:24 +10:00
Rohan Mitchell
9bbc151cae Admin can set enterprises to charge or not charge sales tax 2015-04-17 13:41:38 +10:00
Rob Harrington
7596270154 A few more changes to tidy up standard variant migration 2015-04-17 11:25:18 +10:00
Rob Harrington
5d9e861ee4 Working migration to complete deprecation of master variants 2015-04-17 11:25:18 +10:00
Rob Harrington
447a5481a3 WIP: Building migration to duplicate master variants 2015-04-17 11:25:18 +10:00
Rohan Mitchell
61cb2514cd Add Delayed::Job 2015-04-16 16:54:43 +10:00
Paul Mackay
d4cf44a6dd Use COUNTRY_CODE instead of COUNTRY in application.yml. 2015-03-29 17:06:05 +01:00
Rohan Mitchell
c36272ead6 Switch to update_column, which will not run geocoding callback of Enterprise 2015-03-25 11:37:10 +11:00
Rohan Mitchell
c6ddf36856 Make migration reversible 2015-03-25 11:35:59 +11:00
Paul Mackay
fcfb1aeb87 #440: Try removing validation from update (to prevent geocoding). 2015-03-23 14:24:16 +00:00
Paul Mackay
e39d2eb113 #440: Reset Enterprise columns before querying them. 2015-03-23 13:47:44 +00:00