From 52a8e26e82f718537d1e6a5cdbc123cf77d170a4 Mon Sep 17 00:00:00 2001 From: amir hosein gorji Date: Fri, 3 Jun 2022 15:21:02 +0430 Subject: [PATCH] update 21 files price --- package.json | 4 +- public/en.js | 4 +- public/index.html | 153 ++++++++++----------- src/views/Callback/index.js | 4 +- src/views/Cart/DeliveryMethod/index.js | 8 +- src/views/Cart/Factor/index.js | 12 +- src/views/Cart/Table/index.js | 16 ++- src/views/Cart/index.js | 6 +- src/views/Checkout/DeliveryMethod/index.js | 8 +- src/views/Checkout/Factor/index.js | 16 +-- src/views/Checkout/Table/index.js | 6 +- src/views/Checkout/index.js | 4 +- src/views/Home/HomeScroll/Product/index.js | 4 +- src/views/Home/HomeSlider/Simple/index.js | 2 +- src/views/MyBooks/index.js | 2 +- src/views/Orders/index.js | 5 +- src/views/Product/AddToCart/index.js | 4 +- src/views/Product/index.js | 4 +- src/views/Products/Product/index.js | 2 +- src/views/Support/index.js | 2 +- 20 files changed, 135 insertions(+), 131 deletions(-) diff --git a/package.json b/package.json index a8748e3..da19e8c 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ }, "scripts": { "start": "node scripts/start.js ", - "build": "node scripts/build.js && npm run clean", + "build": "node scripts/build.js ", "test": "node scripts/test.js", "clean": "find ./build -name \"*.map\" -type f -delete" }, @@ -199,4 +199,4 @@ ] ] } -} +} \ No newline at end of file diff --git a/public/en.js b/public/en.js index 0b1ade3..e839247 100644 --- a/public/en.js +++ b/public/en.js @@ -299,7 +299,7 @@ const en = { کاربر: "User", وبلاگ: "weblog", "کدملی / اتباع": "national ID / passport No.", - تومان: "Toman", + تومان: "$", تعداد: "Number", محصول: "the product", جستجو: "Search", @@ -334,7 +334,7 @@ const en = { دختر: "Girl", معلم: "Teacher", مبلغ: "Amount", - پایه: "the base", + پایه: "grade", اول: "First", دوم: "Second", سوم: "Third", diff --git a/public/index.html b/public/index.html index fd88049..e628ae1 100644 --- a/public/index.html +++ b/public/index.html @@ -1,86 +1,77 @@ - - - - - - - - - - - - دانوین - - - - - - + دانوین + + + + - - + window.ratio = (lang == "en" || lang == "ar") ? (1 / 15000) : 1 + function t(val) { + const lang_ = window[lang]; + if (!lang_) return val; + if (!lang_[val]) console.error(val); + return lang_[val] || "*" + val; + } + + (function (w, d, s, l, i) { + w[l] = w[l] || []; + w[l].push({ + "gtm.start": new Date().getTime(), + event: "gtm.js", + }); + var f = d.getElementsByTagName(s)[0], + j = d.createElement(s), + dl = l != "dataLayer" ? "&l=" + l : ""; + j.async = true; + j.src = "https://www.googletagmanager.com/gtm.js?id=" + i + dl; + f.parentNode.insertBefore(j, f); + })(window, document, "script", "dataLayer", "GTM-WVV8H9L"); + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/src/views/Callback/index.js b/src/views/Callback/index.js index 294b4f6..748f57a 100644 --- a/src/views/Callback/index.js +++ b/src/views/Callback/index.js @@ -160,7 +160,7 @@ class Callback extends Component {
- {payPrice} + {window.tr(payPrice)} {window.t("تومان")} @@ -238,7 +238,7 @@ class Callback extends Component {
- {payPrice} + {window.tr(payPrice)} {window.t("تومان")} diff --git a/src/views/Cart/DeliveryMethod/index.js b/src/views/Cart/DeliveryMethod/index.js index 69f74b8..28a648d 100644 --- a/src/views/Cart/DeliveryMethod/index.js +++ b/src/views/Cart/DeliveryMethod/index.js @@ -50,7 +50,9 @@ class DeliveryMethod extends Component { {data.name}
-

{data.price}

+

+ {window.tr(data.price)} +

{window.t("تومان")} @@ -77,7 +79,9 @@ class DeliveryMethod extends Component { {data.name}
-

{data.price}

+

+ {window.tr(data.price)} +

{window.t("تومان")} diff --git a/src/views/Cart/Factor/index.js b/src/views/Cart/Factor/index.js index 7d536f2..4114bb7 100644 --- a/src/views/Cart/Factor/index.js +++ b/src/views/Cart/Factor/index.js @@ -34,7 +34,7 @@ const Factor = (props) => {
{window.t("مبلغ سبد خرید")} - {factorInfo.sumPrice} {window.t("تومان")} + {window.tr(factorInfo.sumPrice)} {window.t("تومان")}
{/*
@@ -47,13 +47,13 @@ const Factor = (props) => {
{window.t("میزان تخفیف")} - {factorInfo.offPrice} {window.t("تومان")} + {window.tr(factorInfo.offPrice)} {window.t("تومان")}
{window.t("مالیات بر ارزش افزوده")} - {factorInfo.vatPrice} {window.t("تومان")} + {window.tr(factorInfo.vatPrice)} {window.t("تومان")}
@@ -65,7 +65,7 @@ const Factor = (props) => { {window.t("مبلغ سبد خرید")} - {factorInfo.sumPrice} {window.t("تومان")} + {window.tr(factorInfo.sumPrice)} {window.t("تومان")}
{/*
@@ -82,7 +82,7 @@ const Factor = (props) => { {window.t("میزان تخفیف")} - {factorInfo.offPrice} {window.t("تومان")} + {window.tr(factorInfo.offPrice)} {window.t("تومان")}
@@ -90,7 +90,7 @@ const Factor = (props) => { {window.t("مالیات بر ارزش افزوده")}{" "} - {factorInfo.vatPrice} {window.t("تومان")} + {window.tr(factorInfo.vatPrice)} {window.t("تومان")}
diff --git a/src/views/Cart/Table/index.js b/src/views/Cart/Table/index.js index 94d714a..bd75821 100644 --- a/src/views/Cart/Table/index.js +++ b/src/views/Cart/Table/index.js @@ -199,14 +199,15 @@ const Item = (props) => { />
- {`نسخه ${ - +data.product.productType === 1 - ? window.t("الکترونیکی") - : window.t("چاپی") - } ${data.product.book.name} `} + {window.t("نسخه") + + ` ${ + +data.product.productType === 1 + ? window.t("الکترونیکی") + : window.t("چاپی") + } ${data.product.book.name} `}

- {`پایه ${grades[data.product.book.gradeId]}`} + {window.t("پایه") + ` ${grades[data.product.book.gradeId]}`}

{window.t("همراه با:")} @@ -348,7 +349,8 @@ const Item = (props) => { {data.product.price * data.count || "1000"} {window.t("تومان")} - {window.t("قیمت هر عدد")} {data.product.price || "100"} + {window.t("قیمت هر عدد")}{" "} + {window.tr(data.product.price) || "100"} {window.t("تومان")}
diff --git a/src/views/Cart/index.js b/src/views/Cart/index.js index 294dca3..847b8b1 100644 --- a/src/views/Cart/index.js +++ b/src/views/Cart/index.js @@ -214,7 +214,8 @@ class Cart extends Component {
- {factorInfo.payPrice - factorInfo.transportPrice} + {(factorInfo.payPrice - factorInfo.transportPrice) * + window.ratio} {window.t("تومان")} @@ -319,7 +320,8 @@ class Cart extends Component { {factorInfo ? (
- {factorInfo.payPrice - factorInfo.transportPrice} + {(factorInfo.payPrice - factorInfo.transportPrice) * + window.ratio} {/* // factorInfo.transportPrice - // factorInfo.offPrice} */} diff --git a/src/views/Checkout/DeliveryMethod/index.js b/src/views/Checkout/DeliveryMethod/index.js index 69f74b8..28a648d 100644 --- a/src/views/Checkout/DeliveryMethod/index.js +++ b/src/views/Checkout/DeliveryMethod/index.js @@ -50,7 +50,9 @@ class DeliveryMethod extends Component { {data.name}
-

{data.price}

+

+ {window.tr(data.price)} +

{window.t("تومان")} @@ -77,7 +79,9 @@ class DeliveryMethod extends Component { {data.name}
-

{data.price}

+

+ {window.tr(data.price)} +

{window.t("تومان")} diff --git a/src/views/Checkout/Factor/index.js b/src/views/Checkout/Factor/index.js index de6c7e4..fb7e089 100644 --- a/src/views/Checkout/Factor/index.js +++ b/src/views/Checkout/Factor/index.js @@ -34,26 +34,26 @@ const Factor = (props) => {
{window.t("مبلغ سبد خرید")} - {factorInfo.sumPrice} {window.t("تومان")} + {window.tr(factorInfo.sumPrice)} {window.t("تومان")}
{window.t("هزینه ارسال")} - {factorInfo.transportPrice} + {window.tr(factorInfo.transportPrice)} {window.t("تومان")}
{window.t("میزان تخفیف")} - {factorInfo.offPrice} {window.t("تومان")} + {window.tr(factorInfo.offPrice)} {window.t("تومان")}
{window.t("مالیات بر ارزش افزوده")} - {factorInfo.vatPrice} {window.t("تومان")} + {window.tr(factorInfo.vatPrice)} {window.t("تومان")}
@@ -65,7 +65,7 @@ const Factor = (props) => { {window.t("مبلغ سبد خرید")}{" "} - {factorInfo.sumPrice} {window.t("تومان")} + {window.tr(factorInfo.sumPrice)} {window.t("تومان")}
@@ -73,7 +73,7 @@ const Factor = (props) => { {window.t("هزینه ارسال")} - {factorInfo.transportPrice} + {window.tr(factorInfo.transportPrice)} {window.t("تومان")}
@@ -82,7 +82,7 @@ const Factor = (props) => { {window.t("میزان تخفیف")} - {factorInfo.offPrice} {window.t("تومان")} + {window.tr(factorInfo.offPrice)} {window.t("تومان")}
@@ -90,7 +90,7 @@ const Factor = (props) => { {window.t("مالیات بر ارزش افزوده")}{" "} - {factorInfo.vatPrice} {window.t("تومان")} + {window.tr(factorInfo.vatPrice)} {window.t("تومان")}
diff --git a/src/views/Checkout/Table/index.js b/src/views/Checkout/Table/index.js index 5fbf05f..e763b11 100644 --- a/src/views/Checkout/Table/index.js +++ b/src/views/Checkout/Table/index.js @@ -164,10 +164,10 @@ const Item = (props) => { } ${data.product.book.name} `}

- {`پایه ${grades[data.product.book.gradeId]}`} + {window.t("پایه") + ` ${grades[data.product.book.gradeId]}`}

- همراه با: + {window.t("همراه با")} : {data.product.book.items || window.t("کد فعالسازی محتوای الکترونیک")} @@ -178,7 +178,7 @@ const Item = (props) => {
- {data.product.price * data.count || "1000"}{" "} + {window.tr(data.product.price * data.count) || "1000"}{" "} {window.t("تومان")}
diff --git a/src/views/Checkout/index.js b/src/views/Checkout/index.js index 2394fae..2f28205 100644 --- a/src/views/Checkout/index.js +++ b/src/views/Checkout/index.js @@ -302,7 +302,7 @@ class Cart extends Component {
- {factorInfo.payPrice} + {window.tr(factorInfo.payPrice)} {window.t("تومان")} @@ -482,7 +482,7 @@ class Cart extends Component { {factorInfo ? (
- {factorInfo.payPrice} + {window.tr(factorInfo.payPrice)} {/* // factorInfo.transportPrice - // factorInfo.offPrice} */} diff --git a/src/views/Home/HomeScroll/Product/index.js b/src/views/Home/HomeScroll/Product/index.js index 24f1ad7..84541fa 100644 --- a/src/views/Home/HomeScroll/Product/index.js +++ b/src/views/Home/HomeScroll/Product/index.js @@ -21,13 +21,13 @@ export default class Product extends Component { {data.oldPrice ? (
- {data.oldPrice} {window.t("تومان")} + {window.tr(data.oldPrice)} {window.t("تومان")}
) : null}
- {data.price} {window.t("تومان")} + {window.tr(data.price)} {window.t("تومان")}
) : ( diff --git a/src/views/Home/HomeSlider/Simple/index.js b/src/views/Home/HomeSlider/Simple/index.js index 25960c0..4b5b8f0 100644 --- a/src/views/Home/HomeSlider/Simple/index.js +++ b/src/views/Home/HomeSlider/Simple/index.js @@ -49,7 +49,7 @@ export default class Simple extends Component { style={{ fontSize: mobile ? 14 : fontSize.desktop.available }} className="slider-simple__price--price d-flex" > - {data.price} {window.t("تومان")} + {window.tr(data.price)} {window.t("تومان")}
) : ( diff --git a/src/views/MyBooks/index.js b/src/views/MyBooks/index.js index 3798824..be963a2 100644 --- a/src/views/MyBooks/index.js +++ b/src/views/MyBooks/index.js @@ -57,7 +57,7 @@ class MyBooks extends Component {
- {item.product.book.name} {"پایه"} + {item.product.book.name} {window.t("پایه")} {grades[item.product.book.gradeId]}
diff --git a/src/views/Orders/index.js b/src/views/Orders/index.js index 1284a2a..1c4c205 100644 --- a/src/views/Orders/index.js +++ b/src/views/Orders/index.js @@ -85,12 +85,13 @@ class Orders extends Component {
- {window.t("مبلغ")} : {item.payPrice}{" "} + {window.t("مبلغ")} : {window.tr(item.payPrice)}{" "} {window.t("تومان")}
- {window.t("تخفیف")} : {item.offPrice}{" "} + {window.t("تخفیف")} :{" "} + {window.tr(item.offPrice)}{" "} {window.t("تومان")}
diff --git a/src/views/Product/AddToCart/index.js b/src/views/Product/AddToCart/index.js index 024f001..d951489 100644 --- a/src/views/Product/AddToCart/index.js +++ b/src/views/Product/AddToCart/index.js @@ -83,7 +83,7 @@ function AddToCart(props) {
- {price} + {window.tr(price)} {" "} {window.t("تومان")}
@@ -91,7 +91,7 @@ function AddToCart(props) { {off ? ( - {off} {window.t("تومان تخفیف")} + {window.tr(off)} {window.t("تومان تخفیف")} ) : null}
diff --git a/src/views/Product/index.js b/src/views/Product/index.js index 6ff8cbc..3b60c49 100644 --- a/src/views/Product/index.js +++ b/src/views/Product/index.js @@ -231,7 +231,7 @@ class Product extends Component { />

{`${ info.name - } پایه ${grades[info.gradeId]}`}

+ } ${window.t("پایه")} ${grades[info.gradeId]}`}

{page !== "digital" ? window.t("نسخه چاپی") @@ -240,7 +240,7 @@ class Product extends Component {

{page === "digital" ? info.product[0].price - : info.product[0].price}{" "} + : window.tr(info.product[0].price)}{" "} {window.t("تومان")}

diff --git a/src/views/Products/Product/index.js b/src/views/Products/Product/index.js index b27c410..6427286 100644 --- a/src/views/Products/Product/index.js +++ b/src/views/Products/Product/index.js @@ -68,7 +68,7 @@ function Product(props) { >

{window.t("نسخه چاپی")}

- {product.product[0].price} {window.t("تومان")} + {window.tr(product.product[0].price)} {window.t("تومان")}
[ item.product.book.id, - `${item.product.book.name} پایه ${ + `${item.product.book.name} ${window.t("پایه")} ${ grades[item.product.book.gradeId] }`, ]) || []