raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,627 Commits 21 Branches 450 Tags
7ef976a52abbd5f189f76cd1d237dc27bf4c4522
Commit Graph

1451 Commits

Author SHA1 Message Date
Matt-Yorkley
8cb2a2cc96 Merge pull request #8451 from Matt-Yorkley/variant-search-debounce 
Fix debounce on variant search dropdown
 2021-11-05 18:59:44 +00:00
Matt-Yorkley
ce61b5088e Fix debounce on variant search dropdown 
This wasn't applied correctly so there was zero debounce, leading to a big excess of pointless requests whilst typing in the variant search dropdown
 2021-11-04 20:44:09 +00:00
Thierry Jet
5ebee9cd5f Translation stuff ready for Close button. Add close: key scoped spree.admin.date_picker in en.yml 2021-10-26 19:38:49 +02:00
Thierry Jet
47e9692226 Add a close button to datepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:36:16 +02:00
Thierry Jet
c45e120ff8 Add a close button to datetimepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:33:02 +02:00
jibees
fa7c64841f Merge pull request #8286 from mkllnk/permalink-check 
Avoid superfluous permalink check on site load
 2021-10-22 09:14:41 +02:00
Nihal M. Kelanthodika
d85a109a21 Merge pull request #7973 from apricot12/HQ_address_in_business_details 2021-10-07 18:32:24 +05:30
Andy Brett
5da1c2f7bd Merge pull request #8288 from mkllnk/pending-changes 
Translate "Save Changes"
 2021-10-06 08:06:48 -07:00
Matt-Yorkley
8393414bf5 Adapt admin enterprise form handling for both address and business_address 2021-10-06 15:06:56 +05:30
Maikel Linke
5b9d5a6bce Avoid console error by catching potential fails 2021-10-06 15:51:43 +11:00
Maikel Linke
129c4c92fa Catch JS error on OC page 
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.

Fixing this then revealed a missing require statement in a controller.
 2021-10-06 15:29:41 +11:00
Maikel Linke
e41a0504b7 Fix coffescript typo 2021-10-06 15:22:11 +11:00
Maikel Linke
75731ed546 Avoid superfluous permalink check on site load 2021-10-06 15:22:02 +11:00
Maikel
5b5693dc26 Merge pull request #8180 from jibees/7504-resolve-rounded-errors 
Avoid rounded with float numbers errors with javascript
 2021-09-23 09:56:03 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Andy Brett
f28200164b Merge pull request #8154 from meronokbay/8098-custom-modal-order-deletion 
Replaced the default alert and confirm modals in the order page by custom modals
 2021-09-15 09:22:58 -07:00
Jean-Baptiste Bellet
ba09618374 Avoid rounded with float numbers errors with javascript 
0.7/0.001 = 699.9999999999999

Use Math.round() to avoid this.
 2021-09-14 10:45:31 +02:00
Meron Ogbai
a065a92616 Reorganize alert and confirm code 2021-09-11 13:36:28 +03:00
Meron Ogbai
aed84912a3 Use selector to get del element 2021-09-11 13:10:33 +03:00
Luis Ramos
60a8ae6675 Remove Stripe Connect gateway and related code 2021-09-10 14:43:24 +05:30
Meron Ogbai
95e294c9ec Use custom modals for deleting orders 2021-09-09 06:25:03 +03:00
Andy Brett
3fcce8574e Merge pull request #8040 from guidoDutra/7627-prevent-removing-last-item-in-order 
Prevent removing last item in order
 2021-08-26 10:01:42 -07:00
Guido Oliveira
b1cd163900 Prevent removing last item in order 2021-08-18 12:00:32 -03:00
Matt-Yorkley
0fefdfb619 Delete unused Angular service ofnConfirmHandler 2021-08-10 16:24:40 +01:00
Matt-Yorkley
5d4d3d4fcf Trigger a digest cycle when opening modals with dynamic content 2021-08-10 16:22:47 +01:00
Matt-Yorkley
5fb782aeba Update $qProvider configuration 
The default logic for how rejected promises are handled has changed slightly. This reinstates the previous default behaviour.
 2021-08-10 16:22:47 +01:00
Matt-Yorkley
40531d769c Update deprecated #success and #error methods on $http service 2021-08-10 16:22:47 +01:00
Matt-Yorkley
5f70275ed4 Update $locationProvider config 
The defaults were changed to something our app doesn't expect. This reinstates the expected behavior
 2021-08-10 16:22:47 +01:00
Matt-Yorkley
eec829de0f Merge pull request #7974 from Matt-Yorkley/jquery2 
Switch to jQuery 2
 2021-08-05 14:47:24 +02:00
Jean-Baptiste Bellet
2116779527 Add order cycle coordinator to the list of enterprises with fees 
- Thus, coordinator can choose to add its own fee for a specific supplier
 2021-07-28 11:40:57 +02:00
Matt-Yorkley
cdf25ee580 Fix some syntax issues 2021-07-23 23:26:39 +01:00
Matt-Yorkley
6d42820f94 Switch to jQuery 2 2021-07-23 21:49:37 +01:00
Jean-Baptiste Bellet
f39cc49cd2 Create a base_locale attribute onto I18n object 
- if "fr": return "fr"
 - if "fr_FR": return "fr"
 2021-07-23 14:14:20 +02:00
Andy Brett
a93eef38c0 Merge pull request #7923 from vishaldeepak/tooltip-order-cycle-subscription 
Tooltip added for 'New Schedule' and 'New Order Cycle'
 2021-07-19 19:32:09 -07:00
Matt-Yorkley
c1b85b7409 Revert removal of default argument in #fetchResults 2021-07-14 13:19:02 +01:00
Matt-Yorkley
cc5b310694 Fix javascript errors where $scope.filteredLineItems hasn't been initialized yet 2021-07-14 13:19:02 +01:00
Nihal Mohammed
e5bdaa603a Setup pagy 2021-07-14 13:17:33 +01:00
vishaldeepak
b70ba7085a Tooltip added for 'New Schedule' and 'New Order Cycle' in Order Cycles tab of admin 2021-07-14 15:15:12 +05:30
Andy Brett
46cd05c54a Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer 
Enable sorting by producer in shopfront
 2021-07-06 09:27:42 -07:00
Nihal Mohammed
edca260af4 Hide shipped orders from BOM and update specs 2021-06-24 18:26:39 +05:30
Andy Brett
ca7b1f047b Merge pull request #7780 from apricot12/new_payment_method_html_bug 
Fix HTML bug on new payment method page
 2021-06-23 08:58:45 -07: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
Jean-Baptiste Bellet
89ea9913e6 Checkbox is correctly handled with null value (and not false) 
- It's better to read the comment juste below the line... 😠 (https://github.com/openfoodfoundation/openfoodnetwork/pull/3076#issuecomment-440010498)
 - Add appropriate spec so it is now correctly tested!
 2021-06-17 21:40:25 +02:00
Guido Oliveira
0f2fd47ca0 Fix supplier loader issue in enterprise controller 2021-06-17 13:57:19 -03:00
Guido Oliveira
92031120e3 Create service for select2 autocomplete 2021-06-17 13:54:18 -03:00
Pau Pérez Fabregat
ef724d2de8 Merge pull request #7758 from jibees/7710-manage-comma-as-decimal-separator-in-unit-value-field 
[UnitPrice] Manage comma as decimal separator in unit value field
 2021-06-17 11:46:22 +02:00
Guido Oliveira
baca89c575 allow select producers for ordering 2021-06-16 15:02:27 -03:00
Nihal Mohammed
522a7384e7 Fix HTML bug on new payment method page and update providers_controller spec 2021-06-12 01:47:08 +05:30
Jean-Baptiste Bellet
db8f8a2675 Create internal methods with regexp test 
- Make it more easily readable and add unit tests
 2021-06-11 10:40:02 +02:00
Jean-Baptiste Bellet
178c0a441b Move unlocalize_currency filter to a PriceParser service 
- It's no longer a filter but more a service: it's therefore more logic.
 2021-06-11 10:01:19 +02:00