raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,617 Commits 18 Branches 451 Tags
87b092fdf774f75bbcff44bb18fb7bf3adfcd91f
Commit Graph

654 Commits

Author SHA1 Message Date
Maikel Linke
87b092fdf7 Adding addresses to existing groups and make them changable 2015-01-22 12:10:54 +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
85882a73ff Merge branch 'lin-d-hop-266reportsbranch' 2014-12-19 16:51:38 +11:00
Rob Harrington
21e4f40616 Implementing primary taxon ordering on the shopfront 2014-12-19 14:05:23 +11:00
Rob Harrington
fcb14f32d2 Validating user input for shopfront taxon order 2014-12-19 14:04:02 +11:00
Rob Harrington
f145a7ed65 Moving taxons into its own module, adding preferred shopfront taxon order to enterprise 2014-12-19 14:04:02 +11:00
Rob Harrington
4b353fa27b Ammending comments to make slightly more clear 2014-12-19 14:04:01 +11:00
Rob Harrington
3fa1832e7b Adding shop closed message preference 2014-12-19 14:04:01 +11:00
Rob Harrington
a489aa7ad9 Fixing enterprise feature spec, adding first shop preference 2014-12-19 14:04:00 +11:00
Rohan Mitchell
4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	spec/models/spree/order_spec.rb
 2014-12-19 09:38:02 +11:00
Rohan Mitchell
31823f2dbd Setting both values to blank deletes override 2014-12-12 13:33:14 +11:00
Rohan Mitchell
ca1c116a5d Swap param order 2014-12-12 13:33:14 +11:00
Rohan Mitchell
45e709b2cc VariantOverrides require hub and variant 2014-12-12 13:33:14 +11:00
Rohan Mitchell
c38686c820 Create new variant overrides 2014-12-12 13:33:14 +11:00
Rohan Mitchell
27444c6589 Extract variant overrides to own controller - permissions 2014-12-12 13:33:14 +11:00
Rohan Mitchell
51d2805de9 WIP: Rename override_variants to variant_overrides 2014-12-12 13:33:13 +11:00
Rohan Mitchell
ff28da345d Find variant overrides for some hubs 2014-12-12 13:33:12 +11:00
Rohan Mitchell
500b5ce347 Enterprise managers can access override variants 2014-12-12 13:33:12 +11:00
Rob Harrington
6a226e4f92 Fixing typos and changing delivery address display in order confirmation email 2014-12-12 12:00:15 +11:00
Rohan Mitchell
086f69ccfb Default payment method server/test_mode to live 2014-12-12 11:35:18 +11:00
Rohan Mitchell
e607c9855f Add Pin Payments gateway 2014-12-12 10:59:23 +11:00
Rob Harrington
dfb9e5bde5 Order reports now present the price of line items with adjustments included 2014-12-11 15:48:29 +11:00
Rob Harrington
699c9a62a5 Removing pretty_inspect so that bugsnag alert work on production 2014-11-27 16:39:14 +11:00
Rob Harrington
a8dde3bbb9 Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry 2014-11-26 15:16:53 +11:00
Rob Harrington
f6b0863279 Make cost breakdowns consistent throughout checkout 2014-11-26 13:07:40 +11:00
Rob Harrington
9bd3909449 Merge master into pretty-emails 2014-11-21 14:43:01 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
f9b4c07219 Add initial VariantOverride model with price lookup 2014-11-21 13:49:09 +11:00
Rob Harrington
5e3f1e4a3b Adding bugsnag notifier to work out what is happening with bug when adding variants to order 2014-11-21 12:37:56 +11:00
Rohan Mitchell
021cca4fca Stylistic changes 2014-11-21 08:41:41 +11:00
Rob Harrington
ebaaf2a136 Display line items in confirmation email with fees included in item totals 2014-11-20 20:17:18 +11:00
Rob Harrington
20341ecbc1 Send bugsnag notification when order confirmation email fails 2014-11-20 12:04:51 +11:00
Rob Harrington
c9d0721acd Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners 2014-11-19 11:03:00 +11:00
Lynne Davis
932d571d2c 266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id 2014-11-12 11:47:26 +00:00
Rob Harrington
ee2ee5dba7 Adding an enterprise welcome email 2014-11-12 15:20:51 +11:00
Rob Harrington
e1823212d6 Reconfirmation email not required when we already know about new email address for enterprise 2014-11-06 21:19:22 +11:00
Rob Harrington
898af0a55e Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice 2014-11-06 21:19:21 +11:00
Rob Harrington
51e768e722 Refactor EnterpriseSet to accept a collection as an argument 2014-11-06 16:29:09 +11:00
Rob Harrington
b27a0986b7 Ensure collection is locked down before we start asssigning attributes to model set 2014-11-06 16:28:24 +11:00
Rob Harrington
be042af751 Add explicit select statement to prevent scope being read only 2014-11-06 15:54:59 +11:00
Lynne Davis
6f6ae309c6 266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet 2014-11-02 11:26:39 +00:00
Rohan Mitchell
abeabd5b1c Add Enterprise#ready_for_checkout? 2014-10-31 14:04:43 +11:00
Rohan Mitchell
94d50f220f Display an error message to admin when there are hubs in order cycles that are not ready for checkout 2014-10-31 12:22:02 +11:00
Rohan Mitchell
f0d3b987d4 Show hubs as unavailable when they do not have available payment and shipping methods 2014-10-31 12:22:02 +11:00
Rob Harrington
65d13e0490 Show error messages on enterprise index page 2014-10-30 13:02:16 +11:00
Rob Harrington
977c508833 Make enterprise limit error messages more specific 2014-10-30 13:02:16 +11:00
Rob Harrington
cc0e205f50 Merge master into onbaording 2014-10-24 15:36:59 +11:00
Rob Harrington
a157528974 Adding specs for single ent dash and remove product ability for profiles 2014-10-24 15:27:08 +11:00
Rob Harrington
d0c3502f27 Adding trial progress bar 2014-10-24 12:32:05 +11:00