David Cook
71782de83a
Apply suggestion from code review
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-02-10 10:35:59 +11:00
David Cook
4624d49e5e
Add translations
2025-02-10 10:33:09 +11:00
filipefurtad0
ed6292aae8
Update all locales with the latest Transifex translations
2025-02-07 15:44:00 -06:00
Filipe
da5856686d
Merge pull request #13112 from Yassir4/12620-fix-rubocop-rails-response-parse-body
...
fix rubocop Rails/ResponseParseBody
2025-02-07 15:44:29 -06:00
Filipe
2d6e627944
Merge pull request #13124 from Yassir4/10685-fix-product-description-truncation
...
Fix product description truncation
2025-02-07 15:24:23 -06:00
Filipe
d09efec1ec
Merge pull request #13037 from chahmedejaz/task/13013-add-columns-supplier-report
...
Add columns to "pay your supplier" report
2025-02-07 10:04:52 -06:00
krisztin
49bf5997b7
Update all borders for inputs
...
Inputs include custom made ones such as tags, select2s and tom selects.
Some border radii were using mixins but not utilising it, hence they
are now variables.
2025-02-07 14:29:27 +00:00
krisztin
4bd925e3ec
Add and update new input border variables
...
1. Border colour did not have sufficient contrast. New contrast ratio
passes WCAG AA for Graphical Objects and user interface components.
2. New border variable to aid consistency and future maintanance.
2025-02-07 14:21:31 +00:00
David Cook
9f7000009d
Only import selected products
2025-02-06 17:10:01 +11:00
David Cook
447ff3cffd
Show list of products to import
...
If there's a matching product in OFN already, a link will appear.
2025-02-06 16:28:15 +11:00
David Cook
c3b23a9fba
Move import to new action
...
Making way for a review step.
2025-02-06 13:50:26 +11:00
David Cook
8acefed857
Swap input positions
...
Makes it clearer where things are going from, and to. I will re-use this order on the next screen.
2025-02-06 13:50:26 +11:00
Hartani Yassir
2753f5694a
Fix product description truncation
2025-02-05 11:55:47 +01:00
Gaetan Craig-Riou
07c6548491
Merge pull request #13120 from dacook/update-caniuse-lite
...
Update caniuse-lite
2025-02-05 16:24:17 +11:00
David Cook
16b8f38d88
Merge pull request #13082 from pacodelaluna/lighten-docker-compose-setup
...
Lighten Docker Compose setup
2025-02-05 09:28:57 +11:00
François Turbelin
0fdf789249
Clean remaining config for Docker system specs
2025-02-04 22:59:31 +01:00
François Turbelin
5ad388911b
Update README for Docker with new default Dockerfile
2025-02-04 22:59:31 +01:00
François Turbelin
db8a193234
Put back Dockerfile for Ubuntu
2025-02-04 22:59:17 +01:00
Maikel Linke
8bfbb74bf3
Pass any option to rubocop
2025-02-04 16:13:24 +11:00
Maikel Linke
b9bff1598d
Add option to define your own rubocop command
...
In development, you may choose to use this script in your Git pre-commit hook.
Then you want the fastest possible execution to not be delayed in your
Git operations. While the default is the safest option, you can now
define your own optimised command to avoid loading the whole Rails app
environment.
2025-02-04 15:59:58 +11:00
Maikel
0eb9dcc8f6
Merge pull request #13109 from mkllnk/product-type-lookup
...
DFC import: Find broader taxon if we don't have a specific one
2025-02-04 15:56:13 +11:00
Maikel Linke
757a1548e6
Fix whitespace
2025-02-04 15:52:28 +11:00
Gaetan Craig-Riou
8db2445203
Add comment to make sure both out of stock modal get updated.
...
There is no easy way to share template between AngularJS and Rails. The
modal in `edit.html.haml` is a copy of app/assets/javascripts/templates/out_of_stock.html.haml,
so we need to update both if either of them is updated.
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
0315fc9690
Remove spec namespacing, left over from spree
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
90eecc783d
Fix stripe controller
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
851cccb823
Fix paypal controller
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
c311b8ac32
Code styling
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
69abdca3ef
Fix insufficient stock modal styling
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
08ad2af91a
Make sure Orders::CheckStockService is only instanciated once
2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
cdcab7c7c6
Update insufficient stock logic
...
We now check for insufficient stock when loading the checkout details
or before updating the order.
2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
e548e74ebe
Update out stock modal
...
It replicates the modal used by the cart :
app/assets/javascripts/templates/out_of_stock.html.haml
2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
7d62a7f5dd
Add CheckStockService#update_line_items
...
Update line item if any related variant has run out of stock or has had
stock reduced
2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
c73c2dd8a8
Add basic out of stock modal
2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
a7cde069c6
Add Orders::CheckStockService and spec
...
Move sufficient_stock? to Orders::CheckStockService
2025-02-04 15:39:40 +11:00
David Cook
8019ad7c1c
Update caniuse-lite
...
As per the notice from webpacker:
Browserslist: caniuse-lite is outdated. Please run:
npx update-browserslist-db@latest
Why you should do it regularly: https://github.com/browserslist/update-db#readme
2025-02-04 11:23:17 +11:00
Hartani Yassir
69f3f9f62d
use format.json in UserRegistrationController#create
2025-02-03 19:02:48 +01:00
Ahmed Ejaz
5dddf8b69a
fix specs
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
d86965bc14
add total tax on product summary
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
393154bae3
13013: fix specs
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
e8b185256e
13013: add specs
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
71b2b7f97f
13013: add tax on product column
2025-01-31 17:34:34 +05:00
Ahmed Ejaz
6a613a2203
13013: add producer charges gst column
2025-01-31 17:34:33 +05:00
Hartani Yassir
ace735b230
Merge branch 'master' into 12620-fix-rubocop-rails-response-parse-body
2025-01-31 11:23:15 +01:00
Hartani Yassir
bd41426aef
fix rubocop Rails/ResponseParseBody
2025-01-31 10:47:03 +01:00
filipefurtad0
c08f925ff8
Update all locales with the latest Transifex translations
2025-01-30 22:03:47 -06:00
Filipe
54fad01a91
Merge pull request #13104 from mkllnk/test-seeds
...
Remove unused preference default_country_id
2025-01-30 21:59:46 -06:00
Filipe
32c4b4557b
Merge pull request #13086 from rioug/fix-tax-rate-refund
...
Remove tax rate refund code path
2025-01-30 21:54:30 -06:00
Filipe
e2161660b3
Merge pull request #13090 from mkllnk/replace-spree-roles
...
Replace spree roles
2025-01-30 21:30:56 -06:00
Maikel
139dba6637
Merge pull request #13108 from dacook/reduce-rack-timeout-logs
...
Log rack-timeout ready and completed messages in DEBUG mode
2025-01-31 10:49:41 +11:00
Maikel Linke
c9f319aa96
Find broader taxon if we don't have a specific one
...
For example, when importing `beef` products associate the type `meat-product`
instead because we don't have a specific beef category.
2025-01-30 11:10:47 +11:00
