raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,854 Commits 17 Branches 456 Tags
5ba8efec2cb1e5ace85b69419ec5a045f85b15e0
Commit Graph

8749 Commits

Author SHA1 Message Date
Luis Ramos
3bf38b7c08 Merge pull request #4549 from luisramos0/arelize_order_permissions 
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
 2020-01-14 14:24:34 +00:00
Luis Ramos
3080eb9dfd Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api 
Removing duplicate API method soft_delete for both products and variants
 2020-01-14 11:32:10 +00:00
Luis Ramos
f87a553230 Merge pull request #4648 from openfoodfoundation/dependabot/bundler/rubocop-0.79.0 
Bump rubocop from 0.68.1 to 0.79.0
 2020-01-13 19:35:50 +00:00
Luis Ramos
3171b60d6f Merge pull request #4580 from Matt-Yorkley/order_capture 
Use asynchronous requests for order capture and ship actions
 2020-01-13 17:14:40 +00:00
Luis Ramos
516398fbd6 Merge pull request #4638 from luisramos0/fix_cart_s2 
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
 2020-01-13 14:16:56 +00:00
Luis Ramos
4a1b74c136 Merge pull request #4634 from luisramos0/remove_dead_code 
Remove some dead code
 2020-01-13 11:09:04 +00:00
Maikel Linke
abcfb5ce8d Update Rubocop config for new version 
- A couple of cops moved into a different namespace.
- The target ruby version doesn't have to be specified, it's read from
  .ruby-version which has been updated to Ruby 2.3.
- Some files were missing in the todo lists.
 2020-01-10 08:59:44 +11:00
Luis Ramos
02dec1d6cd Merge pull request #4649 from tomekr/4623-remove-additional-footeer-links 
Remove duplicate footer links
 2020-01-09 18:04:30 +00:00
Luis Ramos
df04c837a5 Merge pull request #4631 from Matt-Yorkley/oc_buttons 
Increase space for buttons in savebar layout
 2020-01-09 17:56:01 +00:00
Luis Ramos
18e5f9ba64 Merge pull request #4647 from jeduardo824/remove-groups-tab 
remove group link from shop menu when there are no groups
 2020-01-08 11:44:51 +00:00
Luis Ramos
e9a5b889de Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428 
Select by default single Hub/Shop option on creation of payment/shipping method
 2020-01-08 11:44:16 +00:00
Eduardo
c45a3c2303 remove group tabs from shop view when there are no groups 2020-01-07 11:24:46 -03:00
Tomek Rabczak
b948312de7 Remove additional footer links 2020-01-06 13:47:54 -06:00
Matt-Yorkley
91d959b7d6 Remove "previous" button from order cycle savebar 2020-01-03 16:25:26 +01:00
luisramos0
108f57a705 Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict 2020-01-02 16:58:11 +00:00
luisramos0
f63c7cf54f Extract visible_orders_where_values to a private method 2019-12-29 19:01:44 +00:00
luisramos0
13633e8bea Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses 
The | operators here were converting the relations to long lists of IDs, in our current particular issue, an IN clause with 100k order_ids
 2019-12-29 19:01:44 +00:00
luisramos0
093edb66d3 Remove unused view 
This was introduced in 2013 and removed in 2014, see log below:

git log -Saddress_form_simple
commit 510333288c
Author: Maikel Linke <mkllnk@web.de>
Date:   Sun Mar 2 13:05:15 2014 +1100

    first steps of new design

commit 2e1de9a6d3
Author: Rohan Mitchell <rohan@rohanmitchell.com>
Date:   Fri Aug 23 13:12:36 2013 +1000

    Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error
 2019-12-28 18:25:28 +00:00
luisramos0
fb25ddd219 Remove reference to user banners, this code is not used in OFN. 2019-12-28 18:13:04 +00:00
Luis Ramos
0e7dafea46 Merge pull request #4560 from kshlyk/fix_billing_addres_in_pdf_invoice 
Billing address in pdf invoice fixed
 2019-12-27 16:45:06 +00:00
Matt-Yorkley
4c9cc7460a Increase space for buttons in savebar layout 2019-12-27 17:08:37 +01:00
Luis Ramos
9f1eaf0b66 Merge pull request #4512 from luisramos0/backend_ctrl_base 
Bring spree_backend base controller to OFN
 2019-12-24 12:01:07 +00:00
Luis Ramos
1606f9900f Merge pull request #4507 from luisramos0/backend_ctrl_reports 
Bring spree_backend reports controller to OFN
 2019-12-23 16:14:07 +00:00
Luis Ramos
d796e96470 Merge pull request #4575 from Matt-Yorkley/admin_orders 
Fix route on "continue" button on admin adjustments page
 2019-12-23 16:12:28 +00:00
Luis Ramos
ba7f78ef60 Merge pull request #4515 from luisramos0/backend_ctrl_adjustments 
Bring spree_backend adjustments controller to OFN
 2019-12-23 16:05:04 +00:00
cyrillefr
e6d9ec7bd7 Small fixes for default single Hub/Shop options issue 
- removed mode variable
 - reverted html template accordingly
 - added a more specific helper
 - fixed some short variable names
 2019-12-19 21:08:34 +01:00
Luis Ramos
3063439ed1 Merge pull request #4541 from Matt-Yorkley/new_fee_errors 
Handle validation messages when saving new fees
 2019-12-18 13:35:45 +00:00
Matt-Yorkley
a3ee6674ea Use asynchronous requests for order capture and ship actions 2019-12-18 14:15:46 +01:00
cyrillefr
e59077e63e Select by default single Hub/Shop option on creation of payment/shipping method 
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
 2019-12-18 10:45:00 +01:00
luisramos0
f587bbb7d5 Remove unnecessary helper 2019-12-15 21:03:53 +00:00
luisramos0
2793693a7c Improve if clause readability 2019-12-15 21:03:53 +00:00
luisramos0
07e2317369 Replace deprecated URI.unescape with CGI.unescape 2019-12-15 21:03:53 +00:00
luisramos0
042162eda8 Delete unused method 2019-12-15 21:03:53 +00:00
luisramos0
795f13d73a Remove spree alerts feature that would check spree website for security alerts 
This is not something we need running such an old version of spree
 2019-12-15 21:03:53 +00:00
luisramos0
f1814f1b67 Fix most rubocop issues in spree/admin/base_controller 2019-12-15 21:03:53 +00:00
luisramos0
4ab7b78cb8 Merge base_controller with its decorator 2019-12-15 21:03:53 +00:00
luisramos0
11631c3a33 Add base_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-15 21:03:53 +00:00
Konstantin Shlyk
e6ca6bacac soft_delete api method deleted for products and variants 2019-12-14 01:05:35 +03:00
luisramos0
c59326743b Remove sales total report 2019-12-13 16:44:46 +00:00
luisramos0
cb3397fd1a Convert reports index and sales_total views from erb to haml 2019-12-13 16:44:46 +00:00
luisramos0
2bd4de3e29 Add sales total report view 2019-12-13 16:44:46 +00:00
luisramos0
b2c5be775e Fix some rubocop issues 2019-12-13 16:44:46 +00:00
luisramos0
d22212ccfa Merge spree/admin/reports_controller with its decorator 2019-12-13 16:44:44 +00:00
luisramos0
dd600cd163 Add reports_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-13 15:20:03 +00:00
Matt-Yorkley
f189ca8004 Fix route on "continue" button on admin adjustments page 2019-12-13 13:51:41 +01:00
Luis Ramos
db7146014c Rename exchange products file names to increase clarity 2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form 2019-12-13 12:24:16 +00:00
luisramos0
7ad8951375 DRY exchange products templates by extracting header and footer content to partial templates 2019-12-12 18:49:11 +00:00
luisramos0
99e59595b4 Add spinner when loading all products in an exchange 2019-12-12 18:48:36 +00:00
luisramos0
7e3b6e2b5d Fix select all checkbox state in both incoming and outgoing exchanges by using the total count of variants to see if all variants are selected or not, even if not all variants are loaded 2019-12-12 18:48:36 +00:00