Matt-Yorkley
2fb7dfa430
Bring in Paypal Express javascript
2021-01-09 13:22:09 +00:00
Matt-Yorkley
d0800b5e32
Specify json format for API routes that return json in OrderCycleResource
2021-01-08 17:47:09 +00:00
Matt-Yorkley
4bb2653306
Tidy up pagination in Api::ProductsController#overridable and Angular PagedFetcher service
...
Refactors away some unnecessary mess and unblocks the last remaining issue in upgrading the Kaminari gem (deprecated calls to #num_pages method)
2021-01-05 18:57:08 +00:00
Pau Pérez Fabregat
c79baead84
Merge pull request #6524 from ankis17/DatePickerTranslation
...
Fixed Translation for DatePicker
2020-12-14 16:41:51 +01:00
Pau Pérez Fabregat
9f517e1931
Merge pull request #6455 from arku/fix/tabs
...
Fix tab toggle
2020-12-14 09:34:05 +01:00
Ankita Satyavarapu
377febd8d7
Fixed Translation for DatePicker
2020-12-11 22:52:22 -05:00
Andy Brett
a745fceb53
Merge pull request #6469 from andrewpbrett/sca-backend
...
Allow SCA cards to be setup and charged offline for subscriptions
2020-12-11 14:23:12 -08:00
Andy Brett
c70ea44091
show specific error message when add-to-cart fails
2020-12-08 14:37:16 -08:00
Andy Brett
cad8a018f9
put SetupIntent on the connected Stripe account
2020-12-08 07:52:41 -08:00
Andy Brett
215d1bbe20
create js setup intent when authing shop
2020-12-08 07:52:41 -08:00
Andy Brett
f875e406a8
update karma specs for setting default card
2020-12-08 07:46:10 -08:00
Andy Brett
3b44c8e7e2
update UI after changing default card
2020-12-08 07:46:10 -08:00
Andy Brett
c60dcc75cd
confirm changes to default card
2020-12-08 07:46:10 -08:00
Arun Kumar Mohan
868a19df6e
Fix tab toggle
2020-12-03 21:03:44 -05:00
Luis Ramos
f71de8123a
Dont show 'closing in' message when oc closes in more than 3 months
2020-12-03 15:29:14 -08:00
Andy Brett
902f8caea9
direct specifically to shop tab
2020-12-02 11:39:02 -08:00
Andy Brett
14091cd106
fix #6415
2020-12-02 11:39:02 -08:00
Andy Brett
a3a6205343
fix #6252
2020-12-02 11:37:25 -08:00
Luis Ramos
eada388534
Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates
...
This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
a18a198812
Fix locations of requires in admin js all.js
2020-11-04 12:15:45 +00:00
Luis Ramos
cf3f511f4d
Add directive spec to validate the dialog template is loaded on element click
2020-10-30 15:09:13 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
2020-10-30 15:09:13 +00:00
Luis Ramos
be35f97622
Add tooltip icon to terms and conditions
2020-10-30 15:09:13 +00:00
Luis Ramos
ca79270ba3
Show T&Cs warning when uploading a new file
2020-10-30 15:09:13 +00:00
Luis Ramos
ceee89fad0
Make Checkout form submit read terms_and_conditions_accepted from the checkout form checkbox
2020-10-30 15:09:13 +00:00
Luis Ramos
57a9d6e1e2
Make customer terms_and_conditions_accepted_at be set to current time
...
after a successful checkout
2020-10-30 15:09:13 +00:00
Luis Ramos
6b826423c1
Merge pull request #6145 from andrewpbrett/instance-unit-picker
...
Allow instances to choose available units for products/variants
2020-10-29 22:22:33 +00:00
Andy Brett
2605b9cdf0
refactor unitScales function
2020-10-29 09:18:24 -07:00
Andy Brett
867947f6b2
refactor availableUnitScales into unitScales
2020-10-29 09:18:24 -07:00
Andy Brett
8591934c19
extract availableUnits to separate method
2020-10-29 09:18:24 -07:00
Andy Brett
23dd09eaad
remove extra debugger statement 🤦
2020-10-29 09:18:23 -07:00
Andy Brett
fa62ec0bff
only show available units for products
2020-10-29 09:17:49 -07:00
Luis Ramos
e860e2ca57
Add label to customer balance so it's clear to the manager what's the balance status: credit owed or balance due
2020-10-29 13:38:36 +00:00
Luis Ramos
76afc0b407
Merge pull request #6202 from cillian/sort-admin-products-by-name-fix
...
Fix sorting of admin products by name
2020-10-29 00:09:31 +00:00
Matt-Yorkley
5edd562691
Merge pull request #6238 from openfoodfoundation/mobile-5-product-listings
...
Merge Product Listings to master
2020-10-22 21:55:42 +02:00
Matt-Yorkley
489529d30e
Merge pull request #5729 from luisramos0/image_settings
...
Remove Image settings page and standardise Paperclip styles
2020-10-22 15:58:14 +02:00
Maikel Linke
db53848092
Enable switching language of "Price breakdown"
...
And move translation to its own context.
2020-10-22 15:46:49 +11:00
Maikel Linke
ec1887544e
Reduce bulk input modal size
...
This brings the related elements closer together.
2020-10-22 15:46:49 +11:00
Maikel Linke
bbe2ce9cba
Add "Price breakdown" heading to pop-up
...
The translation key was already present even though it was unused.
2020-10-22 15:46:48 +11:00
Maikel Linke
30bfb1a7bd
Fix clickable area when opening price breakdown
...
Once a price breakdown has been opened, the nub was over the bottom half
of the pie button. It made half of the pie unclickable.
And when you closed the breakdown, it became invisible but stayed
present, absorbing all clicks in that area. So other pie buttons were
unclickable as well.
2020-10-22 15:46:48 +11:00
Maikel Linke
cb5089a69a
Increase space for variant name on mobile
2020-10-22 15:46:48 +11:00
Maikel Linke
3a3ec4e45e
Close price breakdown on click outside
2020-10-22 15:46:47 +11:00
Maikel Linke
1fd4dc471a
Position the price breakdown below the button
2020-10-22 15:46:47 +11:00
Maikel Linke
230d3e76a1
Label plus and minus symbols as special
2020-10-22 15:46:47 +11:00
Maikel Linke
cdbbcfd1fe
Better naming for translation keys
2020-10-22 15:46:47 +11:00
Maikel Linke
e45941276e
Better naming of translation keys
...
Also splitting one key for two different uses.
2020-10-22 15:46:47 +11:00
Maikel Linke
d2600b1d40
Avoid translation errors by hardcoding symbols
...
The fullwidth plus and minus signs are well understood in all countries
(that participate in the development of OFN). It's more likely that a
translator enters a normal plus or minus than that they want to change
the symbol. A normal + or - sign doesn't fill a whole character space
and is therefore not well aligned in the design.
2020-10-22 15:46:47 +11:00
Maikel Linke
9da91576ac
Fix height of invisible "in cart" text
...
While the text "x in cart" isn't visible, the item quantity is not set.
A missing variable leads to longer text that is taken up more space. In
this case it was two lines instead of one line. The resulting extra line
of margin disappeared when adding to the cart and the rest of the page
jumped up.
2020-10-22 15:46:46 +11:00
Maikel Linke
57178659c3
Remove bulk icon as per design
2020-10-22 15:46:46 +11:00
Maikel Linke
d337561ea8
Move ShopVariantCtrl to own file and spec it
2020-10-22 15:46:46 +11:00
