Compare commits

..

1 Commits

Author SHA1 Message Date
Rachel Arnould
b5020cc740 Update en.yml
Removing mentions about UFC Que choisir and changing the link
2024-11-25 13:31:36 +01:00
6 changed files with 9 additions and 11 deletions

View File

@@ -86,7 +86,7 @@ gem "active_model_serializers", "0.8.4"
gem 'activerecord-session_store'
gem 'acts-as-taggable-on'
gem 'angularjs-file-upload-rails', '~> 2.4.1'
gem 'bigdecimal'
gem 'bigdecimal', '3.0.2'
gem 'bootsnap', require: false
gem 'geocoder'
gem 'gmaps4rails'

View File

@@ -180,7 +180,7 @@ GEM
base64 (0.2.0)
bcp47_spec (0.2.1)
bcrypt (3.1.20)
bigdecimal (3.1.8)
bigdecimal (3.0.2)
bindata (2.5.0)
bindex (0.8.1)
bootsnap (1.18.3)
@@ -865,7 +865,7 @@ DEPENDENCIES
angularjs-rails (= 1.8.0)
arel-helpers (~> 2.12)
aws-sdk-s3
bigdecimal
bigdecimal (= 3.0.2)
bootsnap
bugsnag
bullet

View File

@@ -58,7 +58,7 @@ module VariantUnits
def option_value_value_unit_scaled
unit_scale, unit_name = scale_for_unit_value
value = (@nameable.unit_value.to_d / unit_scale).round(2)
value = (@nameable.unit_value / unit_scale).to_d.truncate(2)
[value, unit_name]
end

View File

@@ -10,8 +10,7 @@ export default class extends Controller {
changePage(event) {
const productsForm = document.querySelector("#products-form");
if (productsForm) productsForm.scrollIntoView({ behavior: "smooth" });
productsForm.scrollIntoView({ behavior: "smooth" });
this.page.value = event.target.dataset.page;
this.submitSearch();
this.page.value = 1;

View File

@@ -1412,7 +1412,7 @@ en:
connected_apps:
legend: "Connected apps"
affiliate_sales_data:
title: "INRAE / UFC QUE CHOISIR Research"
title: "INRAE Research"
tagline: "Allow this research project to access your orders data anonymously"
enable: "Allow data sharing"
disable: "Stop sharing"
@@ -1420,10 +1420,10 @@ en:
need_to_be_manager: "Only managers can connect apps."
description_html: |
<p>
INRAE and UFC QUE CHOISIR are teaming up to study food prices in short food systems and compare them with prices in the supermarket, for a given set of products. The data that is used by INRAE is mixed with data coming from other short food chain platforms in France. No individual product prices will be publicly disclosed through this project.
INRAE are studiying food prices in short food systems and compare them with prices in the supermarket, for a given set of products. The data that is used by INRAE is mixed with data coming from other short food chain platforms in France. No individual product prices will be publicly disclosed through this project.
</p>
<p>
<a href="https://apropos.coopcircuits.fr/"
<a href="https://pepr-sams.fr/2024/03/12/plat4terfood/"
target="_blank"><b>Learn more about this research project</b>
<i class="icon-external-link"></i></a>
</p>

View File

@@ -145,8 +145,7 @@ RSpec.describe "Reporting::Reports::SalesTax::SalesTaxTotalsByOrder" do
total = report.total_excl_tax(query_row)
# discounted order total - discounted order tax
# (113.3 - 10) - (3.3 - 0.29)
expect(total).to eq 100.29
expect(total).to eq((113.3 - 10) - (3.3 - 0.29))
end
end
end