Add multiple currencies to booking pages

aelassas · Dec 12, 2024 · c28c1b5 · c28c1b5
1 parent 9b78f41
commit c28c1b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/frontend/src/components/BookingList.tsx b/frontend/src/components/BookingList.tsx
@@ -30,6 +30,7 @@ import { fr as dfnsFR, enUS as dfnsENUS } from 'date-fns/locale'
 import * as bookcarsTypes from ':bookcars-types'
 import * as bookcarsHelper from ':bookcars-helper'
 import * as BookingService from '@/services/BookingService'
+import * as StripeService from '@/services/StripeService'
 import * as helper from '@/common/helper'
 import { strings } from '@/lang/booking-list'
 import { strings as csStrings } from '@/lang/cars'
@@ -124,6 +125,10 @@ const BookingList = ({
         }
         const totalRecords = Array.isArray(_data.pageInfo) && _data.pageInfo.length > 0 ? _data.pageInfo[0].totalRecords : 0
 
+        for (const booking of _data.resultData) {
+          booking.price = await StripeService.convertPrice(booking.price!)
+        }
+
         if (env.isMobile) {
           const _rows = _page === 0 ? _data.resultData : [...rows, ..._data.resultData]
           setRows(_rows)

diff --git a/frontend/src/pages/Booking.tsx b/frontend/src/pages/Booking.tsx
@@ -18,6 +18,7 @@ import Layout from '@/components/Layout'
 import * as UserService from '@/services/UserService'
 import * as BookingService from '@/services/BookingService'
 import * as CarService from '@/services/CarService'
+import * as StripeService from '@/services/StripeService'
 import Backdrop from '@/components/SimpleBackdrop'
 import NoMatch from './NoMatch'
 import Error from './Error'
@@ -249,7 +250,7 @@ const Booking = () => {
           const _booking = await BookingService.getBooking(id)
           if (_booking) {
             setBooking(_booking)
-            setPrice(_booking.price)
+            setPrice(await StripeService.convertPrice(_booking.price!))
             setLoading(false)
             setVisible(true)
             const cmp = _booking.supplier as bookcarsTypes.User
@@ -476,7 +477,7 @@ const Booking = () => {
               <div>
                 {edit && (
                   <div className="booking-buttons">
-                    <Button variant="contained" className="btn-primary btn-margin-bottom" size="small" type="submit">
+                    <Button variant="contained" className="btn-primary btn-margin-bottom" type="submit">
                       {commonStrings.SAVE}
                     </Button>
                   </div>
@@ -489,7 +490,7 @@ const Booking = () => {
               <div className="price">
                 <span className="price-days">{helper.getDays(days)}</span>
                 <span className="price-main">{bookcarsHelper.formatPrice(price as number, commonStrings.CURRENCY, language)}</span>
-                <span className="price-day">{`${csStrings.PRICE_PER_DAY} ${bookcarsHelper.formatPrice(Math.floor((price as number) / days), commonStrings.CURRENCY, language)}`}</span>
+                <span className="price-day">{`${csStrings.PRICE_PER_DAY} ${bookcarsHelper.formatPrice((price as number) / days, commonStrings.CURRENCY, language)}`}</span>
               </div>
             </div>
             <CarList