raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 19 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

8189 Commits

Author SHA1 Message Date
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
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
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 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
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
86a500bcdf Fix browser caching of updated icon font 2018-02-23 20:49:42 +00:00
Matt-Yorkley
7bd0de99ac Adjust brittle referer header check 2018-02-23 16:35:46 +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
Rob Harrington
6bdbdc06e7 Use select2_search instead of targetted_select2_search 2018-02-22 16:13:29 +11:00
Rob Harrington
2e94654f91 Create factory to hold auxillary functions for subscriptions 
NOTE: Moved estimatedSubtotal and estimatedTotal functions to the new factory from the subscription line items controller
 2018-02-22 16:13:29 +11:00
Rob Harrington
2a731b2db5 Rename SubscriptionPrototype to SubscriptionActions 2018-02-22 16:13:29 +11:00
Rob Harrington
dcfa5fa42d Use services to access injected data arrays 2018-02-22 16:13:29 +11:00
Rob Harrington
ad62b258ac Populate 'all' array from Schedules#load 2018-02-22 16:13:29 +11:00
Rob Harrington
95f70409ee Auto-load customers into service when present 2018-02-22 16:13:29 +11:00
Rob Harrington
3ac57269ed Use .all convention for shipping and payment methods resource services 2018-02-22 16:13:29 +11:00
Rob Harrington
8951c79f71 Only count future orders in subs index order count 2018-02-22 15:09:33 +11:00
Rob Harrington
b3e7badd37 Fix incorrect translation key 2018-02-22 14:33:25 +11:00
Rob Harrington
cec5fddf6a Add missing translation 2018-02-22 14:33:25 +11:00
Rob Harrington
c4a81bdc48 Translate subscriptions loading flash 2018-02-22 14:33:25 +11:00
Hugo Daniel
3fa5ca7eae Use accessible_by method instead of involving_managed_distributors method to fetch all order cycles 2018-02-21 17:33:28 +11:00
Hugo Daniel
65fea6291e CodeClimate requested changes 2018-02-21 17:33:28 +11:00
Hugo Daniel
64c2bdda1c Added loading of all active or complete order cycles concerned by the current user to the reports form collection 
User will see all order cycles he is concerned by as producer, distributor or coordinator
 2018-02-21 17:33:28 +11:00
Rob Harrington
927ab3a23a Make subscriptions setup checklist more legible 2018-02-19 11:11:10 +11:00
Matt-Yorkley
8a11dc3c33 Decouple image upload from Spree 2018-02-14 13:46:05 +00:00
Matt-Yorkley
7d27d1325e Bulk Edit image upload 
Image Upload Translations

Squashme

Squashme

Squashme

Code review tweaks
 2018-02-14 13:46:05 +00:00
Matt-Yorkley
24dca5e51f Add image column to product bulk edit 2018-02-14 13:46:05 +00:00
Matt-Yorkley
d52f9fd43f Add enterprise limit modal 2018-02-13 14:05:18 +00:00
jtruong2
6c92fdf167 fixes issue if admin and handling == 0 then do not render row 2018-02-12 15:53:19 +01:00
Maxime Lalisse
11eda94949 Add i18n for admin/orders 2018-02-09 17:40:31 +01:00
Pau Perez
c79641c77c Fix typos in documentation 2018-02-09 09:53:40 +01:00
Pau Perez
aa4bd7f397 Improve code style and docs of job 2018-02-09 09:53:39 +01:00
Rob Harrington
e12207f3de Use shop contact email and contact name for subscription emails 2018-02-09 14:44:15 +11:00