Pau Perez
7707df354b
Merge branch 'master' into 2-0-stable
...
* master: (206 commits)
embedded groups layout changes
embedded groups initial test
Allow html requests for OrderCycleController#update
Move applicator calls to OrderCycleForm
Refactor OrderCycleForm to make logic clearer
Extract schedule syncing logic into OrderCycleForm
Add basic specs for OrderCyclesController#create
Add basic OrderCycleForm to handle create/update logic
Remove unnecessary respond_to blocks from OrderCyclesController
Include admin users as managers on new enterprises
Remove obsolete goWithoutHashFragments
Simplify Navigation.go, not preserving hash fragments
Only show change warning for open order cycles
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
Preload subscription counts for serialization in order cycle collection actions
Request the subscription count for change warning each time, don't cache
Ask user to confirm oc date change for open order cycles with subsciptions
Fix ordering of Gemfile.lock
Add rack-rewrite to handle redirects
Renames product bulk edit action to index
...
2018-06-22 13:23:18 +02:00
Rob Harrington
3619ec0dc8
Add is_default attribute to Spree::CreditCard model
2018-06-08 12:01:10 +10:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Frank West
91351c3f78
Confirm first user when seeding database
...
Currently the first user is not confirmed until running the task
`openfoodnetwork:dev:load_sample_data`. This task does not need to be
run on a minimum implementation of a new server or development setup.
We now confirm the first user during seeding. This could be the default
email address or the user entered email address entered during seeding.
2018-05-14 15:30:04 -07:00
Pau Perez
19870eccdc
Install and run Spree v2.0.4 migrations
2018-04-27 17:02:28 +02:00
Pau Pérez Fabregat
9e14186431
Merge pull request #2149 from oeoeaio/subs-remove-fields
...
Subs: Remove obsolete subscription fields from order cycles table
2018-03-23 15:12:32 +01:00
Pau Perez
092122969c
Make mail env vars mandatory
2018-03-16 13:33:21 +01:00
Pau Perez
f27a624687
Create the mail method from db:seed
...
As opposed the to sample users and enterprises that ease testing and
development, the mail method is needed for the app to function in any
environment.
2018-03-16 13:33:21 +01:00
Rob Harrington
9840467b8a
Remove obsolete subscription fields from order cycles table
2018-03-16 14:55:22 +11:00
Pau Pérez Fabregat
6f5080923f
Merge pull request #2123 from coopdevs/bring-seeds-from-ofn-install
...
Bring seeds from ofn install
2018-03-12 11:43:14 +01:00
Pau Perez
c19c22cb17
Apply couple simple tweaks to seeds.rb
2018-03-09 13:20:35 +01:00
Pau Perez
5eb3dc4beb
Bring states.yml from l10n_au
...
The states.yml present in this repo had a different format which doesn't
work with the current seeds.rb that we brought from ofn-install.
2018-03-07 10:30:12 +01:00
Pau Perez
9849f76c1c
Bring seeds.rb from ofn-install
2018-03-07 10:28:34 +01:00
Rob Harrington
ad391c73ab
Add migration to add fee estimate fields to subscriptions table
2018-03-02 10:11:26 +11:00
Pierre de Lacroix
ab1ed16435
Add a migration to change Spree::Users enterprise_limit default value from 1 to 5
2018-02-13 14:05:17 +00:00
Rob Harrington
eb53df8238
Rename 'standing_line_items' table to 'subscription_line_items'
2018-02-09 14:44:14 +11:00
Rob Harrington
b258c032cc
Rename 'standing_orders' table to 'subscriptions'
2018-02-09 14:44:12 +11:00
Rob Harrington
3ac2ac34ed
Add credit_card_id to StandingOrder model
2018-02-09 14:44:03 +11:00
Rob Harrington
01cbd7ae9d
WIP: Adding flags for standing order placement and confirmation to proxy_orders table
2018-02-09 14:43:58 +11:00
Rob Harrington
e7b8648792
Adding standing orders feature toggle column to enterprises table
2018-02-09 14:43:57 +11:00
Rob Harrington
f57cae9124
Removing null: false contraint on order_id for ProxyOrder
2018-02-09 14:43:55 +11:00
Rob Harrington
64206bc35b
ProxyOrders belong to order cycles
2018-02-09 14:43:54 +11:00
Rob Harrington
e351c3e355
Renaming StandingOrderOrder to ProxyOrder
2018-02-09 14:43:54 +11:00
Rob Harrington
2a03477597
Adding standing_orders_confirmed_at flag to order_cycles
2018-02-09 14:43:54 +11:00
Rob Harrington
961df756c5
Adding paused_at column to standing orders
2018-02-09 14:43:52 +11:00
Rob Harrington
736de4826f
Renaming cancelled_at column to canceled_at, for consistency
2018-02-09 14:43:52 +11:00
Rob Harrington
284103b6b6
Adding canceled_at column to standing_orders table
2018-02-09 14:43:50 +11:00
Rob Harrington
f4cbd90400
Storing estimated prices for standing line items in the database
2018-02-09 14:43:46 +11:00
Rob Harrington
140d62939a
Adding processing marker column standing_orders_placed_at to order cycles
2018-02-09 14:43:39 +11:00
Rob Harrington
a7132684e5
Standing Orders: create join table for linking orders with standing orders
2018-02-09 14:43:37 +11:00
Rob Harrington
b701ca43f4
WIP: adding shiping and billing address to StandingOrder model
2018-02-09 14:43:37 +11:00
Rob Harrington
e4de7e262d
SO: Adding StandingLineItem model
2018-02-09 14:43:29 +11:00
Rob Harrington
d711c321b6
SO: Adding Standing Order Model
2018-02-09 14:43:29 +11:00
Rob Harrington
a25f2141a5
Adding Order Cycle Schedules join table
2018-02-09 14:43:27 +11:00
Rob Harrington
c51b956b01
Adding Schedule model
2018-02-09 14:43:27 +11:00
Matt-Yorkley
ee08dcfeb4
Use owner as contact if user record doesn't exist
2018-02-07 10:41:53 +11:00
Matt-Yorkley
39f0c5b5b0
Rename contact name field and revert contact name specs
2018-02-07 10:41:53 +11:00
Matt-Yorkley
9e270690ef
Remove enterprise email
...
A user with the same email address is receiving notifications now.
If the email address is invalid, the owner receives notifications.
2018-02-07 10:41:53 +11:00
Matt-Yorkley
9ccb3ee80b
Add receives_notifications flag to enterprise_roles
2018-02-07 10:41:52 +11:00
Matt-Yorkley
22eae753fe
Remove enterprise confirmations
2018-02-07 10:41:52 +11:00
Matt-Yorkley
aead867ea0
Set all current users to confirmed
2018-02-07 10:41:51 +11:00
Matt-Yorkley
179cf6e484
Tidy up confirmation migrations
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
a6f2ee1367
Add migration to confirm already confirmed email addresses
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
dbbc2ddb1c
Add confirmable email to user model
2018-02-07 10:41:51 +11:00
Rob Harrington
d1779b9457
Keep timestamps as :null => false in schema
2017-09-23 14:58:32 +10:00
stveep
a1cad82564
Only show credit cards if previously saved, split credit card db migrations and tidy up serializer
2017-09-23 14:58:31 +10:00
stveep
3b05b76b80
Bring in ability to store CreditCards against Users from Spree 2.3 (spree commit d470b31798f3).
2017-09-23 14:58:31 +10:00
Steve Pettitt
1db0bbef09
Create table for stripe accounts
2017-09-23 14:57:01 +10:00
Rob Harrington
074018d2a6
Copy and run adjustment states migration from updated version of spree
...
Note: this migration took 28.7571s to run against Aus production data on my local machine
2017-09-22 11:16:29 +10:00
Julius Pabrinkis
1fe20eba45
Add backend to be able to switch language by param and persist in cookies and user db
2017-09-20 13:23:15 +10:00
