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
Pau Pérez Fabregat
bd83443595
Merge pull request #6611 from jibees/6196-fix-text-wrapping-on-oc
...
6196 fix text wrapping on oc
2021-01-08 11:48:41 +01:00
Jean-Baptiste Bellet
39fc80172e
move css property
2021-01-06 09:49:12 +01:00
Jean-Baptiste Bellet
1b4906d55a
adjust margin according to old design
2021-01-06 09:17:11 +01:00
Jean-Baptiste Bellet
6e6be09740
use display flex to align
2021-01-06 09:16:38 +01:00
Jean-Baptiste Bellet
3a8b63b371
remove height constraint
2021-01-06 09:16:19 +01: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
Matt-Yorkley
0ceba7c0a8
Update orders closing message
2020-12-03 15:29:14 -08: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
65f6f1febf
rearrange css
2020-12-02 11:37:25 -08:00
Andy Brett
99b5d9e0c5
use white-space: nowrap on variant prices
2020-12-02 11:37:25 -08:00
Andy Brett
a3a6205343
fix #6252
2020-12-02 11:37:25 -08:00
Matt-Yorkley
3b92df42c3
Fix the menu!
...
🙈
2020-11-16 19:05:08 +00:00
Pau Perez
634ab5ca6a
Don't scale logo image
...
The trick using `width: 100%` and a set `max-width` doesn't work if we
can't know the image width as it can be uploaded by superadmins. There's
no need though because the media query breakpoint triggers just before that.
2020-11-10 09:51:41 +01:00
Pau Perez
1903c575ff
Reorder properties alphabetically
...
As Hound demands.
2020-11-09 15:40:25 +01:00
Pau Perez
9a885173b9
Remove element from class selector
...
Fixes Hound error `Avoid qualifying class selectors with an element.`.
2020-11-09 15:39:09 +01:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Matt-Yorkley
bc96ad9515
Merge pull request #6299 from Matt-Yorkley/admin-image-edit
...
Fix display issue in product image edit page
2020-11-05 18:28:10 +01: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
79a7cf9b39
Add default spree logo
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
Matt-Yorkley
d147996af6
Fix display issue in product image edit page
2020-11-03 18:41:09 +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
