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
21,229 Commits 19 Branches 453 Tags
49dbca71b8e4e365de0a7fdff4ba4b6d21331215
Commit Graph

4874 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
42e26f3328 Merge pull request #7708 from andrewpbrett/payment-states 
Add `requires_authorization` Payment state
 2021-06-18 17:04:03 +02:00
Pau Pérez Fabregat
aa9a85159e Merge pull request #7806 from mkllnk/feature-toggles 
Remove custom feature toggles
 2021-06-18 12:23:21 +02:00
Pau Pérez Fabregat
db993652c4 Merge branch 'master' into payment-states 2021-06-18 12:20:26 +02:00
Pau Pérez Fabregat
b500486f6b Merge pull request #7211 from jibees/4207-add-query-params-in-url 
Orders list : save filters params
 2021-06-18 11:19:26 +02:00
Pau Pérez Fabregat
11a7316b9d Merge pull request #7759 from apricot12/fix_duplicate_refund 
Disable credit button on click
 2021-06-18 09:27:45 +02:00
Maikel Linke
a712f254e0 Remove Australian custom homepage content 
This was activated with a feature toggle. But when we re-implemented the
feature toggles, we accidentally broke this one and it hasn't been
active for two months. Nobody complained and it doesn't seem to be
needed while developers are keen to remove instance-specific
customisations anyway.
 2021-06-18 10:46:50 +10:00
Andy Brett
3e32abe64f add colors and translations for requires_authorization state 2021-06-17 14:23:59 -07:00
Andy Brett
5a25de1c82 Merge pull request #7760 from apricot12/remove_unused_partial_paypal 
Remove unused partial paypal
 2021-06-17 13:21:33 -07:00
Andy Brett
bcd0173ed0 Merge pull request #7305 from cillian/add-distributor-to-shipment-email 
Add enterprise name to subject and body of shipment shipped email
 2021-06-17 12:53:09 -07:00
Matt-Yorkley
c821380ff1 Merge pull request #7749 from apricot12/remove_paypal_refund_button 
Remove refund button from paypal completed order tab
 2021-06-17 21:37:51 +02:00
Maikel Linke
af314cbbdf Allow fast checkout without re-accepting old terms 
We did that for the shop's terms already and now do it for the platform
terms as well.
 2021-06-09 14:06:54 +10:00
Maikel Linke
e3be519b25 Style TOS page to be usable 
It's not pretty but only used by instance managers, very rarely.
 2021-06-09 14:06:54 +10:00
Maikel Linke
51ad8f8065 Remove old UI to edit Terms of service 
It's now completely replaced by file uploads on a separate page.
 2021-06-09 14:06:54 +10:00
Maikel Linke
23999c96bf Unify all links to platform Terms of service 
DRY code and have more consistency. We always use "Terms of service" now
and not "Terms of Service" or "Terms and conditions". The latter is used
for the shop's terms, not the platform terms.
 2021-06-09 14:06:54 +10:00
Maikel Linke
3b3ba70670 Safeguard deletion of ToS with alert 2021-06-09 14:06:54 +10:00
Maikel Linke
690118c2bd Add delete method to terms of service files 2021-06-09 14:06:54 +10:00
Maikel Linke
abe76ccf0f Add upload of Terms of Service files 
Admins can upload files and view the most recent (current) one.
 2021-06-09 14:06:54 +10:00
Maikel Linke
ed4f61acd7 Add title to TOS config page 2021-06-09 14:06:53 +10:00
Maikel Linke
007b8cd888 Add new admin page for TOS files 
Just the basic Rails setup without any functionality yet.
 2021-06-09 14:06:53 +10:00
Andy Brett
b6f6407c31 Merge pull request #7660 from jibees/7499-remove-feature-toggle-for-unit-price 
Remove feature toggle around unit_price
 2021-06-08 10:39:32 -07:00
Andy Brett
74d93e324c Merge pull request #7661 from romale/products_import_date_translation 
Missed import_date translation key
 2021-06-08 10:26:13 -07:00
Nihal Mohammed
3b4baab01a Remove unused _paypal_complete partial 2021-06-08 16:31:26 +05:30
Nihal Mohammed
4476d7f69e Disable credit button on click 2021-06-08 14:41:25 +05:30
Jean-Baptiste Bellet
e3f56556cf Remove feature toggle around unit_price and enable it 2021-06-07 20:53:45 +02:00
Nihal Mohammed
a5190ec5d7 Remove refund button from paypal completed order tab 2021-06-07 16:07:31 +05:30
Luis Ramos
4252bd0bb1 For some reason report helper is not available on this view now, so we call Spree::Money directly 2021-06-01 22:34:04 +01:00
Jean-Baptiste Bellet
385446807d Add a clear filters button 
- This button clear all stored filters and then update results
 2021-05-31 10:44:21 +02:00
Jean-Baptiste Bellet
303bf5420e Add select2WatchNgModel directive 
- Select2 components cannot handle ng-model correctly: they do not update if the ng-model change. Add a directive to watch the ng-model and update the component value
 2021-05-31 10:44:21 +02:00
Jean-Baptiste Bellet
58a96c6500 Add missing ] char to be consistant 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
4f50afc188 Change shipping_method_id storage: in the query 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
1674c6a252 Improve HTML to improve tests readability 
- Specify `for` attribute to `<label />` element
- Initialize component with its default value

So, it's linked to its `<input />`
 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
c5a2d183d8 Save filter params to sessionStorage for orders list 
- Use sessionStorage to save the filters params each time a filter is modified
 2021-05-31 10:44:12 +02:00
Pau Pérez Fabregat
bfa77baae1 Merge pull request #7542 from jibees/6359-add-payment-method-description-to-invoice 
Add payment method description to invoice
 2021-05-27 11:01:07 +02:00
Matt-Yorkley
ecb4cb31ad Merge pull request #7599 from Matt-Yorkley/cart-rendering 
Move line item rendering to a collection in cart page
 2021-05-25 13:37:50 +02:00
Matt-Yorkley
74f27544f7 Merge pull request #7647 from andrewpbrett/default-country-codes 
Use correct default country code
 2021-05-25 11:21:34 +02:00
Andy Brett
b367001b95 Merge pull request #7641 from luisramos0/order_path 
[Rails 6.1] Fix view specs
 2021-05-24 14:41:32 -07:00
Jean-Baptiste Bellet
7ab065e8cd Add section at the bottom of invoice: Payment Description at Checkout 
- If there is any payments, we use the last one to retrieve the payment method description
Use the first completed payment to display payment description
Completed is state = "checkout" or state = "completed"
Squash w/ "Add section at the bottom of invoice: Payment Description at Checkout"

Squash w "Add section at the bottom of invoice: Payment Description a"
 2021-05-19 11:55:38 +02:00
Matt-Yorkley
0c4e191f3b Render enterprise rows as a collection 
Note: this is a bit like an N+1 query, but for rendering. If there are 30 enterprises, the partial file would be loaded and parsed 30 times; but if we render it as a collection it'll load the partial once and substantially improve the performance.
 2021-05-19 08:48:25 +01:00
Andy Brett
7df2915fbd add DefaultCountry service 2021-05-18 12:44:53 -07:00
alex
4a5cb7f628 Missed import_date translation 2021-05-18 18:30:59 +03:00
Andy Brett
f2c3b096a0 Merge pull request #7566 from luisramos0/erb 
[Rails 6.0] Fix problem in erb template by explicitly setting format to js
 2021-05-15 10:45:01 -07:00
Luis Ramos
90db52e5f5 Fix route 2021-05-14 00:14:02 +01:00
Luis Ramos
0243e5cbb8 Fix route in order view 2021-05-13 23:08:50 +01:00
Matt-Yorkley
122ba385f7 Move line item rendering to collection in cart page 
Improvement from upstream Spree commit. Brings a big performance boost to rendering, especially with larger numbers of items in the cart. 50%+ reduction in rendering times reported.
 2021-05-10 11:50:31 +01:00
Andy Brett
66da72ccc2 use raw to render stripe mock js 2021-05-08 17:29:38 -07:00
Luis Ramos
de000228cf Fix problem in erb template by explicitly setting format to js while calling it 2021-05-06 23:52:16 +01:00
Pau Pérez Fabregat
057bcddee9 Merge pull request #7478 from jibees/7458-get-products-on-order-cycle-change-events 
Get the whole list of products on order cycle changes
 2021-04-30 11:39:15 +02:00
Andy Brett
f64d5a9f59 Merge pull request #7438 from jibees/7353-fix-OC-display-issue-text-on-two-lines 
Change the position of order_cycle component into a shop front
 2021-04-29 14:05:06 -07:00
Andy Brett
c069a23926 Merge pull request #7476 from cillian/admin-stripe-elements-width 
Increase the width of Stripe Elements fields in admin so they don't overlap
 2021-04-29 14:04:44 -07:00
Jean-Baptiste Bellet
07881ede2d Do not trigger loadMore method immediatly 
- This avoid to request unwanted resources, ie. the next 10 products of a shop
 2021-04-27 11:24:48 +02:00