raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,052 Commits 19 Branches 453 Tags
afda5cc04ee972cb30b3bc0bc655a5b7818b8ab2
Commit Graph

9052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Pérez Fabregat
afda5cc04e Merge pull request #2115 from coopdevs/localize-sample-data 
Localize sample data
 2018-03-09 16:18:18 +01:00
Pau Perez
12e225e7c0 Add sample addresses in the instance's country 
This ensures the address country and state are valid, meaning the state
belongs to the provided country. We use the instance's to do that.
 2018-03-09 13:33:05 +01:00
Pau Pérez Fabregat
b5a8df00dd Merge pull request #2117 from coopdevs/confirm-example-user 
Automatically confirm the spree@example.com user
 2018-03-09 07:24:40 +01:00
Enrico Stano
0aacb91f50 Merge pull request #2116 from coopdevs/clean-sample-data 
Clean sample data
 2018-03-07 20:58:30 +01:00
Pau Perez
ae2eba89ca Automatically confirm the spree@example.com user 
This allows you to log in with it after you run `bundle exec
openfoodnetwork:dev:load_sample_data` rake task right away.
 2018-03-07 10:10:38 +01:00
Rob H
dadbb7445b Merge pull request #2110 from oeoeaio/subs-summary-hash 
Subs: Fix summary emails for shop owners
 2018-03-07 16:41:38 +11:00
Rob H
4fd307832e Merge pull request #2120 from oeoeaio/subs-unpause-messaging 
Subs: messaging around unpausing a subscription
 2018-03-07 16:41:00 +11:00
Rob Harrington
09ca9ac2dd Alter scope to return both completed and resumed orders 2018-03-07 14:24:59 +11:00
Rob Harrington
b98afc00ba Show message about resumable orders when unpausing a subscription 2018-03-07 14:24:59 +11:00
Rob Harrington
7332e21013 Make InfoDialog more flexible (can show information as well as errors) 2018-03-07 14:24:58 +11:00
Rob Harrington
5cb0a1c371 Fix position of jQuery dialogs in admin section 2018-03-07 14:24:58 +11:00
Pau Perez
10d6a29503 Move service class to its own file 2018-03-06 15:30:25 +01:00
Pau Perez
e06af77420 Move from hash rocket to symbol syntax 2018-03-06 13:46:32 +01:00
Pau Pérez Fabregat
392d0de6c5 Merge pull request #2055 from HugsDaniel/1766_entreprise_registration_scroll_on_first_step 
Changed bootstrap grid for medium size and above to have text and but…
 2018-03-06 11:39:35 +01:00
Pau Pérez Fabregat
0fdd7dabd4 Merge pull request #2026 from Matt-Yorkley/uk/embedded_headers 
Only include one host in embedded shopfront headers
 2018-03-06 11:07:32 +01:00
Pau Pérez Fabregat
c999627d28 Merge pull request #2114 from ltrls/fix-old-rspec-syntax 
Fix old rspec syntax
 2018-03-06 11:04:21 +01:00
Hugo Daniel
f2eee77a15 fixed modal height and change grid to have button and text side by side 2018-03-06 16:21:35 +11:00
Pierre de Lacroix
040c292a76 Fix some more old rspec syntax 2018-03-06 01:29:54 +01:00
Pierre de Lacroix
12e3b88b71 Fix some old Rspec syntax 2018-03-06 01:24:54 +01:00
Rob Harrington
2bfa923fe1 Use a hash instead of an array :face_palm: 2018-03-02 15:50:10 +11:00
Rob H
d30362b78c Merge pull request #2108 from oeoeaio/subs-neg-stock 
Subs: handle negative stock for subscriptions
 2018-03-02 15:47:12 +11:00
Rob Harrington
28491ee948 Skip stock check when requested quantity is zero 
This prevents an error being raised when available stock is negative
 2018-03-02 14:53:24 +11:00
Rob Harrington
fe4145d9d5 Use expect syntax 2018-03-02 14:53:24 +11:00
Rob H
3ef29fde2c Merge pull request #2107 from oeoeaio/subs-missing-close 
Subs: Add message to indicate OC has no close date
 2018-03-02 14:52:54 +11:00
Rob Harrington
05e6c3daa6 Add message to indicate missing orders_close_at date 2018-03-02 13:28:34 +11:00
Rob H
9d8456cbf3 Merge pull request #2090 from oeoeaio/subs-styling 
Subs: Make checklist more legible
 2018-03-02 13:24:05 +11:00
Rob H
1d8f332cc6 Merge pull request #2096 from oeoeaio/subs-estimates 
Subs:  Improve estimates of item prices and fees
 2018-03-02 13:22:27 +11:00
Rob Harrington
6f554814ce Add class documentation for SubscriptionEstimator 2018-03-02 10:11:26 +11:00
Rob Harrington
f1545a4ab6 Show fee estimates in subscription totals in UI 2018-03-02 10:11:26 +11:00
Rob Harrington
31750a7bba Add logic for calculator of fee estimates to SubscriptionEstimator 2018-03-02 10:11:26 +11:00
Rob Harrington
ad391c73ab Add migration to add fee estimate fields to subscriptions table 2018-03-02 10:11:26 +11:00
Rob Harrington
014283447d Use delegate to access subscription shop 2018-03-02 10:11:26 +11:00
Rob Harrington
3b2d4ae2d4 Estimator take variant overrides into account 2018-03-02 10:11:26 +11:00
Rob Harrington
14a03aab35 Fallback to previous saved estimate if calculator not available 2018-03-02 10:11:26 +11:00
Rob Harrington
904a364bf1 Stop unnecessarily passing fee_calculators around 2018-03-02 10:11:26 +11:00
Rob Harrington
30df1d4345 Refector controller to allow price_estimate calculation 2018-03-02 10:11:26 +11:00
Rob Harrington
b85e38010f Delegate responsibility to estimating prices for subscriptions to dedicated service object 2018-03-02 10:11:26 +11:00
Enrico Stano
14caac0212 Merge pull request #2074 from mjal/2057states-are-not-displayed-in-modify-address-pop-in-and-prevent-saving-2 
Bug fix in customers edit address
 2018-03-01 14:59:02 +01:00
Enrico Stano
6e9efe79b7 Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit 
Increase default enterprise limit
 2018-03-01 14:40:24 +01:00
Maxime Lalisse
cff1d7224d Bug fix in customers edit address 2018-03-01 22:02:39 +11:00
Matt-Yorkley
7bd0de99ac Adjust brittle referer header check 2018-02-23 16:35:46 +00:00
Matt-Yorkley
9506ea456e Stub the request object instead of controller method 2018-02-23 15:57:28 +00:00
Matt-Yorkley
e173f823c8 Refactor embedded logic 2018-02-23 15:57:28 +00:00
Matt-Yorkley
4a818c07bb Only include one host in embedded shopfornt headers 2018-02-23 15:57:28 +00:00
Rob Harrington
1ac9417a20 Add class description for ProxyOrder 2018-02-22 16:23:10 +11:00
Rob Harrington
ae1c8344d1 Ensure price estimates generated for subscriptions take overrides into account 2018-02-22 16:16:49 +11:00
Rob Harrington
add9c83812 Ensure correct price is used by OrderFactory when building line items 2018-02-22 16:16:49 +11:00
Rob Harrington
993f02a989 Add knowledge of variant overrides to OrderFactory 2018-02-22 16:16:49 +11:00
Rob Harrington
d7d40a4a0f Create new OrderFactory service object for initializing order from attr hash 2018-02-22 16:16:49 +11:00
Rob Harrington
6bf4ed1ac5 Add new review view to subscription wizard 2018-02-22 16:13:29 +11:00