raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
a5d4c50dea Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test. 2018-10-26 21:32:16 +01:00
luisramos0
09f8df6340 Reorganize LineItemsController's destroy line item specs to separate contexts with different test orders (completed_with_total and completed_with_fees) 2018-10-25 18:06:48 +01:00
Pau Pérez Fabregat
8a3f621b42 Merge pull request #2893 from luisramos0/deleted_products_break_inventory 
Fix bug in inventory management page
 2018-10-25 18:20:42 +02:00
Pau Pérez Fabregat
7cac4637fe Merge pull request #2916 from luisramos0/date-transl-fix 
Add Portuguese and German to list of momentJS locales
 2018-10-25 18:18:53 +02:00
luisramos0
90d7b7f4a0 Merge branch 'master' into 2-0-stable-oct-25 2018-10-25 14:28:58 +01:00
Kristina Lim
2cc594dc98 Proceed to hide off-canvas when resized to >1024px 2018-10-25 20:36:27 +08:00
Kristina Lim
14eaa49204 Disable hiding the off-canvas upon window resize. 
In some browsers for mobile devices, the address bar is automatically
hidden when scrolling down the page. This is not workable if the height
of the contents of the off-canvas exceeds the height of the screen,
because the latter portion of the contents stays hidden to the user.

https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js
 2018-10-25 19:29:19 +08:00
Maikel
acb8ec772e Merge pull request #2922 from mkllnk/update-rubocop-todo 
Update rubocop todo list
 2018-10-25 14:48:51 +11:00
Maikel
3cab3d1798 Merge pull request #2921 from openfoodfoundation/transifex 
Transifex
 2018-10-25 14:22:10 +11:00
Maikel Linke
cd5c23993a Update rubocop todo list 
Since we activated more cops in 0ac16ce096
we had a lot of files missing in the todo list. They are likely from
other pull requests that have been open at the same time. This is a
quick update so that rubocop gives us some useful feedback again.
 2018-10-25 14:08:04 +11:00
Maikel Linke
e6adb8a3b9 Extract email setup in specs for easy upgrade 
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
 2018-10-25 13:53:22 +11:00
Maikel
51a1787881 Merge pull request #2908 from Matt-Yorkley/bulk_orders_bug 
Fix pagination conflict with LineItemsCtrl requests
 2018-10-25 13:18:11 +11:00
Maikel Linke
dc5302ca08 Speed up database queries and make them scale 
This commit makes use of three ActiveRecord features:

1. Using `select` instead of `all.map` enables ActiveRecord to nest one
select into the other, resulting in one more efficient query instead of
two.

2. Using `find_each` saves memory by loading records in batches.
https://api.rubyonrails.org/classes/ActiveRecord/Batches.html#method-i-find_each

3. Using `pluck` creates only an array, avoiding loading all the other
columns of the records into objects.

Running this on the current Canadian database, fixes the following
variant overrides:

```
[]
[]
[]
[]
[]
[]
[925, 924, 966, 965]
[]
[]
[]
[]
[462,
 863,
 464,
 822,
 949,
 947,
 944,
 939,
 942,
 946,
 945,
 943,
 438,
 937,
 938,
 941,
 940,
 467,
 952,
 875,
 453,
 953,
 454,
 951,
 487,
 460,
 457,
 528,
 527,
 486,
 459,
 458,
 461,
 529,
 530,
 950,
 642,
 384,
 380,
 643,
 385,
 381,
 644,
 386,
 382,
 960,
 959,
 379,
 640,
 377,
 375,
 532,
 639,
 376,
 374,
 646,
 390,
 389,
 637,
 406,
 408,
 647,
 391,
 393,
 633,
 396,
 400,
 398,
 645,
 388,
 387,
 648,
 394,
 392,
 536,
 632,
 399,
 397,
 395,
 634,
 403,
 401,
 635,
 404,
 402,
 636,
 407,
 405,
 535,
 534,
 638,
 410,
 409,
 948,
 533,
 537,
 531,
 877,
 880,
 894,
 893,
 672,
 671,
 673,
 674,
 703,
 714,
 715,
 716,
 717,
 862,
 864,
 879,
 876,
 865,
 881,
 878,
 463,
 954,
 866,
 823,
 957,
 958,
 955,
 956,
 899,
 897]
[]
[969]
```
 2018-10-25 11:33:14 +11:00
Transifex-Openfoodnetwork
c17939631f Updating translations for config/locales/en_US.yml 2018-10-25 09:31:36 +11:00
Pau Pérez Fabregat
ce93c52dfe Merge pull request #2850 from Matt-Yorkley/password_change_logout 
Password change logout
 2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat
9ef4852bd4 Merge pull request #2818 from nikobozi/refactor-variant-overrides-query 
Move query from variant_overrides_controller to its model scope
 2018-10-24 11:42:22 +02:00
Pau Pérez Fabregat
7651ee0909 Merge pull request #2798 from as1729/as1729-update-docs-Stripe-publishable_key-for-pr 
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
 2018-10-24 11:23:21 +02:00
Pau Pérez Fabregat
f32e4dddb1 Merge pull request #2902 from luisramos0/more-pending-tests 
[Spree Upgrade] Mark specs from secondary features as xfeature
 2018-10-23 19:00:49 +02:00
Pau Pérez Fabregat
9a06c1ef98 Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin 
[Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2
 2018-10-23 18:59:01 +02:00
Pau Pérez Fabregat
235d42024a Merge pull request #2903 from luisramos0/2884-2-0-order-ships-path 
[Spree Upgrade] In order list page, the shipment state is now a label, not a link. The shipments page is gone in spree 2.
 2018-10-23 18:57:05 +02:00
luisramos0
c9784a5eda Add Portuguese and German to list of moment locales. The main usage is in the order cycle closure time in the shopfront 2018-10-23 17:53:08 +01:00
luisramos0
034d9ef72a Refactor multilingual spec: extract method with repeated assertion 2018-10-23 14:10:52 +01:00
luisramos0
9d9f5d38d7 Fix multi lingual issue in cart and checkout: the user language selection was not being used 2018-10-23 14:10:48 +01:00
Hugo Daniel
c5f6af95c7 Add password confirmation, token and expired keys 2018-10-23 10:40:20 +02:00
Maikel
6f5289c730 Merge pull request #2894 from openfoodfoundation/transifex 
Transifex
 2018-10-23 16:21:20 +11:00
Luis Ramos
a9b390d0aa Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs 
[Spree Upgrade] Fix feature specs for shipping_methods
 2018-10-22 23:12:20 +01:00
Matt-Yorkley
42c1584e6f Fix pagination conflict with LineItemsCtrl requests 2018-10-22 18:13:56 +01:00
Pau Pérez Fabregat
a1bbf5328e Merge pull request #2872 from mkllnk/2765-fix-geocoding 
2765 Fix geocoding to display enterprises on map
 2018-10-22 16:44:30 +02:00
luisramos0
d0d9038308 Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2 2018-10-22 11:24:01 +01:00
luisramos0
34d1e6ffdb Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794 2018-10-21 22:13:15 +01:00
luisramos0
7ae5a615b2 Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending 2018-10-21 22:09:21 +01:00
luisramos0
6f78f3c595 Move all specs in proxy_order_spec temporarily to pending 2018-10-21 22:08:10 +01:00
luisramos0
b0ffb0f91a Move all specs in subscription_confirm_job_spec temporarily to pending 2018-10-21 22:07:23 +01:00
luisramos0
2e64226d29 Move all specs in spec/features/admin/subscriptions_spec temporarily to pending 2018-10-21 22:06:31 +01:00
luisramos0
ca786249a6 Move all specs in subscription_form_spec temporarily to pending 2018-10-21 22:05:45 +01:00
luisramos0
3afc59c864 Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending 2018-10-21 22:04:16 +01:00
luisramos0
5b6b0f408f Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing 2018-10-21 22:02:34 +01:00
luisramos0
5d36450de2 Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing 2018-10-21 21:56:55 +01:00
luisramos0
92c7db2249 Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem 2018-10-20 23:43:33 +01:00
luisramos0
f3ef3d0c3e Avoiding variantStock raise by creating variant first and then setting count_on_hand 2018-10-20 23:28:22 +01:00
luisramos0
653c67971f Remove order admin page filter 'show only unfulfilled orders' as done on spree 2 2018-10-20 15:11:47 +01:00
luisramos0
d375bb8c55 Migration: Revoke variant overrides without permissions 2018-10-20 12:32:55 +01:00
luisramos0
9079437284 Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted 2018-10-20 12:32:51 +01:00
luisramos0
5ae0ad87a7 Refactor EnterpriseRelationship before save hook: some renames and extract methods 2018-10-20 11:52:11 +01:00
Matt-Yorkley
c3cef699ca Use https on all links in emails in production 2018-10-19 17:03:51 +01:00
Transifex-Openfoodnetwork
c911462737 Updating translations for config/locales/en_GB.yml 2018-10-20 02:04:33 +11:00
luisramos0
c373d5ab33 Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method 2018-10-18 19:44:38 +01:00
luisramos0
df36e0b344 In cart population, replace usage of global allow_backorders with variant.on_demand adapter 2018-10-18 18:37:09 +01:00
Pau Pérez Fabregat
32632addfb Merge pull request #2823 from luisramos0/2-0-order-spec-fees 
[Spree Upgrade] Fix fees tests in models/spree/order_spec
 2018-10-18 13:30:15 +02:00
luisramos0
a92e8c9923 Improve readability of shipment decorator 2018-10-18 10:54:21 +01:00