@riosst100/pwa-marketplace 3.2.5 → 3.2.7

package/src/components/RFQPage/orderRow.js

@@ -1,196 +1,115 @@
 import React from 'react';
-import { arrayOf, number, shape, string } from 'prop-types';
-import { ChevronDown, ChevronUp } from 'react-feather';
+import { number, shape, string } from 'prop-types';
 import { FormattedMessage, useIntl } from 'react-intl';
 import Price from '@magento/venia-ui/lib/components/Price';
-import { useOrderRow } from '@magento/peregrine/lib/talons/OrderHistoryPage/useOrderRow';
-
 import { useStyle } from '@magento/venia-ui/lib/classify';
-import Icon from '@magento/venia-ui/lib/components/Icon';
-import CollapsedImageGallery from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/OrderHistoryPage/collapsedImageGallery';
-import OrderDetails from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/OrderHistoryPage/OrderDetails';
-import defaultClasses from '@riosst100/pwa-marketplace/src/overwrites/venia-ui/lib/components/OrderHistoryPage/orderRow.module.css';
-import cn from 'classnames';
-import { Verify } from 'iconsax-react';
-import PlaceholderImage from '@magento/venia-ui/lib/components/Image/placeholderImage';
+import defaultClasses from './orderRow.module.css';
 import { Link } from 'react-router-dom';
+import cn from 'classnames';
 
 const OrderRow = props => {
-    const { order } = props;
+    const { rfq } = props;
     const { formatMessage } = useIntl();
     const {
-        invoices,
-        items,
-        number: orderNumber,
-        order_date: orderDate,
-        shipments,
+        quickrfq_id,
         status,
-        total
-    } = order;
-    const { grand_total: grandTotal } = total;
-    const { currency, value: orderTotal } = grandTotal;
-
-    // Convert date to ISO-8601 format so Safari can also parse it
-    const isoFormattedDate = orderDate.replace(' ', 'T');
-    const formattedDate = new Date(isoFormattedDate).toLocaleDateString(
-        undefined,
-        {
-            year: 'numeric',
-            month: 'short',
-            day: 'numeric'
-        }
-    );
-
-    const hasInvoice = !!invoices.length;
-    const hasShipment = !!shipments.length;
-    let derivedStatus;
-    if (status === 'Complete') {
-        derivedStatus = formatMessage({
-            id: 'Quotes.deliveredText',
-            defaultMessage: 'Delivered'
-        });
-    } else if (hasShipment) {
-        derivedStatus = formatMessage({
-            id: 'Quotes.shippedText',
-            defaultMessage: 'Shipped'
-        });
-    } else if (hasInvoice) {
-        derivedStatus = formatMessage({
-            id: 'Quotes.readyToShipText',
-            defaultMessage: 'Ready to ship'
-        });
-    } else {
-        derivedStatus = formatMessage({
-            id: 'Quotes.new',
-            defaultMessage: 'New'
-        });
-    }
-
-    const talonProps = useOrderRow({ items });
-    const { loading, isOpen, imagesData } = talonProps;
+        product_name,
+        quantity,
+        price_per_product,
+        store_currency_code
+    } = rfq;
 
     const classes = useStyle(defaultClasses, props.classes);
 
-    const contentClass = isOpen ? classes.content : classes.content_collapsed;
-
-    const contentToggleIconSrc = isOpen ? ChevronUp : ChevronDown;
-
-    const contentToggleIcon = <Icon src={contentToggleIconSrc} size={24} />;
-
-    const collapsedImageGalleryElement = isOpen ? null : (
-        <CollapsedImageGallery items={imagesData} />
-    );
-
-    const orderDetails = loading ? null : (
-        <OrderDetails orderData={order} imagesData={imagesData} />
-    );
-
-    const orderTotalPrice =
-        currency && orderTotal !== null ? (
-            <Price currencyCode={currency} value={orderTotal} />
-        ) : (
-            '-'
-        );
+    const unitPrice =
+        price_per_product && typeof price_per_product.value === 'number'
+            ? price_per_product.value
+            : null;
+    const unitCurrency =
+        price_per_product && price_per_product.currency
+            ? price_per_product.currency
+            : store_currency_code;
+
+    const qtyNumber = typeof quantity === 'number'
+        ? quantity
+        : (typeof quantity === 'string' ? parseFloat(quantity) : 0);
+    const totalPrice =
+        unitPrice !== null && !isNaN(qtyNumber)
+            ? unitPrice * qtyNumber
+            : null;
 
     const badgeStatusStyle = () => {
-        return 'bg-[#F1EFF6] text-blue-700 text-[14px] font-medium rounded-full px-[30px] py-[5px] border-none';
-    }
-
-    const thumbnailProps = {
-        alt: items[0].product_name,
-        classes: { root: classes.thumbnail },
-        width: 50
+        return 'text-blue-700 text-[14px] font-medium py-[5px] border-none';
     };
 
     return (
         <li className={classes.root}>
-            <div className='flex flex-col md_flex-row justify-between mb-2.5'>
-                <div className='flex flex-col'>
-                    <div className="flex gap-x-[15px] flex-row">
-                        <span className="text-[14px] text-colorDefault">{formattedDate}</span>
-                        <span className="text-gray-200 text-[14px]">{orderNumber}</span>
+            <div
+                className='flex flex-col md_flex-row md_items-start justify-between mb-2.5'
+                style={{ borderBottom: '1px solid #e6e9ea', paddingBottom: '10px' }}
+            >
+                <div className='flex flex-col ml-[14px] mt-[5px]'>
+                    <div className='flex gap-x-[15px] flex-col'>
+                        <div className='flex gap-x-[5px] items-center'>
+                            <span className='text-blue-700 text-[14px]'>#{quickrfq_id}</span>
+                        </div>
                     </div>
                 </div>
                 <div className='flex flex-col'>
                     <div className='flex w-full justify-start mt-2.5 md_mt-0 md_justify-end'>
-                        <span className={cn(classes.orderStatusBadge, badgeStatusStyle())}>
-                            {derivedStatus}
-                        </span>
+                        <span className={cn(classes.orderStatusBadge, badgeStatusStyle())}>{status}</span>
                     </div>
                 </div>
             </div>
-            <div className='flex flex-col md_flex-row justify-between mb-2.5'>
-                <div className='flex flex-col'>
-                    <div className='flex gap-x-[5px] mb-2.5'>
-                        <Verify size={17} className='text-blue-700' variant="Bold" />
-                        <span className='text-xs font-medium text-[rgba(25, 34, 42, 0.7)]'>
-                            Gundam Info
-                        </span>
-                    </div>
-                    <div className='flex flex-row'>
-                        <div>
-                            <PlaceholderImage {...thumbnailProps} />
-                        </div>
-                        <div className='flex flex-col max-w-[260px] gap-2.5'>
-                            <div className={cn(classes.productName, 'text-[14] font-medium')}>
-                                <span>
-                                    {items[0]?.product_name}
-                                </span>
+            <div className='flex flex-col md_flex-column justify-between mb-0'>
+                <div className='flex flex-col ml-[5px] gap-y-[10px]'>
+                    <div
+                        className='flex flex-row gap-4 mb-1 justify-between'
+                        style={{ borderBottom: '1px solid #e6e9ea', paddingBottom: '10px' }}
+                    >
+                        <div className='flex flex-col gap-1 pb-2 last_pb-0 max-w-[375px]'>
+                            <div className={cn(classes.productName, 'text-[14px] font-medium')}>
+                                <span>{product_name}</span>
                             </div>
-                            <div className="text-[14] text-gray-200">
-                                <span>
-                                    {`${items[0]?.quantity_ordered}X`}
-                                </span>
-                                {' '}
+                            <div className='text-[12px]'>
+                                <span>x{`${quantity}`}</span>
+                            </div>
+                        </div>
+                        <div class="flex flex-col gap-1 pb-2 last_pb-0 justify-center">
+                            <div class="text-[14px] text-blue-700 mr-4">
                                 <span>
-                                    <Price currencyCode={items[0]?.product_sale_price?.currency} value={items[0]?.product_sale_price?.value} />
+                                    {unitPrice !== null ? (
+                                        <Price currencyCode={unitCurrency} value={unitPrice} />
+                                    ) : (
+                                        '-'
+                                    )}
                                 </span>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div className='flex flex-col'>
-                    <div className="md_px-10 py-3 md_border-l border-gray-100">
-                        <span className="text-[14] text-gray-200 text-left md_text-center block mb-2">
-                            <FormattedMessage
-                                id={'orderRow.orderTotalText'}
-                                defaultMessage={'Order Total'}
-                            />
+                <div className='flex flex-col items-end gap-4 md_pl-10 md_self-end mr-4 mb-1 pt-2'>
+                    <div className='md_text-right flex flex-row gap-5 items-center'>
+                        <span className='text-[14px] text-gray-200 block mb-1'>
+                            <FormattedMessage id={'orderRow.orderTotalText'} defaultMessage={'Order Total'} />
                         </span>
-                        <div className="text-lg font-medium text-left md_text-center block">{orderTotalPrice}</div>
+                        <div className='text-lg font-medium text-blue-700'>
+                            {totalPrice !== null ? (
+                                <Price currencyCode={unitCurrency} value={totalPrice} />
+                            ) : (
+                                '-'
+                            )}
+                        </div>
+                    </div>
+                    <div className='flex flex-row gap-2 w-full justify-end items-center'>
+                        <Link to={`/quotes/${quickrfq_id}`}>
+                            <span className='bg-blue-700 hover:bg-white hover:text-blue-700 hover:border hover:border-blue-700 rounded-full px-[30px] py-[8px] text-[13px] font-medium text-white transition-all duration-300 ease-in-out'>
+                                <FormattedMessage id={'orderRow.ViewTransactionDetail'} defaultMessage={'View Offer'} />
+                            </span>
+                        </Link>
                     </div>
                 </div>
             </div>
-            <div className='flex flex-row justify-end py-[5px]'>
-                <Link to="/quotes/DEV123123123">
-                    <span className="text-[13px] font-medium text-blue-700 underline">
-                        <FormattedMessage
-                            id={'orderRow.ViewTransactionDetail'}
-                            defaultMessage={'View Transaction Detail'}
-                        />
-                    </span>
-                </Link>
-            </div>
-
-            {/* <div className={classes.orderDateContainer}>
-                <span className={classes.orderDateLabel}>
-                    <FormattedMessage
-                        id={'orderRow.orderDateText'}
-                        defaultMessage={'Order Date'}
-                    />
-                </span>
-                <span className={classes.orderDate}>{formattedDate}</span>
-            </div> */}
-            {/* <div className={classes.orderItemsContainer}>
-                {collapsedImageGalleryElement}
-            </div> */}
-            {/* <div className={classes.orderStatusContainer}>
-                <span className={classes.orderStatusBadge}>
-                    {derivedStatus}
-                </span>
-                <OrderProgressBar status={derivedStatus} />
-            </div> */}
-            <div className={cn(contentClass, '!py-4 mt-4')}>{orderDetails}</div>
         </li>
     );
 };
@@ -220,99 +139,15 @@ OrderRow.propTypes = {
         content: string,
         content_collapsed: string
     }),
-    order: shape({
-        billing_address: shape({
-            city: string,
-            country_code: string,
-            firstname: string,
-            lastname: string,
-            postcode: string,
-            region_id: string,
-            street: arrayOf(string)
-        }),
-        items: arrayOf(
-            shape({
-                id: string,
-                product_name: string,
-                product_sale_price: shape({
-                    currency: string,
-                    value: number
-                }),
-                product_sku: string,
-                selected_options: arrayOf(
-                    shape({
-                        label: string,
-                        value: string
-                    })
-                ),
-                quantity_ordered: number
-            })
-        ),
-        invoices: arrayOf(
-            shape({
-                id: string
-            })
-        ),
-        number: string,
-        order_date: string,
-        payment_methods: arrayOf(
-            shape({
-                type: string,
-                additional_data: arrayOf(
-                    shape({
-                        name: string,
-                        value: string
-                    })
-                )
-            })
-        ),
-        shipping_address: shape({
-            city: string,
-            country_code: string,
-            firstname: string,
-            lastname: string,
-            postcode: string,
-            region_id: string,
-            street: arrayOf(string),
-            telephone: string
-        }),
-        shipping_method: string,
-        shipments: arrayOf(
-            shape({
-                id: string,
-                tracking: arrayOf(
-                    shape({
-                        number: string
-                    })
-                )
-            })
-        ),
+    rfq: shape({
+        quickrfq_id: string,
         status: string,
-        total: shape({
-            discounts: arrayOf(
-                shape({
-                    amount: shape({
-                        currency: string,
-                        value: number
-                    })
-                })
-            ),
-            grand_total: shape({
-                currency: string,
-                value: number
-            }),
-            subtotal: shape({
-                currency: string,
-                value: number
-            }),
-            total_tax: shape({
-                currency: string,
-                value: number
-            }),
-            total_shipping: shape({
-                currency: string,
-                value: number
-            })
-        })
+        product_name: string,
+        quantity: string,
+        price_per_product: shape({
+            currency: string,
+            value: number
+        }),
+        store_currency_code: string
     })
 };

package/src/components/RFQPage/orderRow.module.css

@@ -0,0 +1,146 @@
+.root {
+    composes: border from global;
+    composes: border-gray-100 from global;
+    /* composes: grid from global;
+    composes: grid-cols-2 from global; */
+    composes: rounded-md from global;
+    composes: p-[15px] from global;
+}
+
+@media (min-width: 960px) {
+    .root {
+        /* grid-template-columns:
+            minmax(9rem, 1fr) minmax(9rem, 1fr) minmax(9rem, 1fr) 16rem 2fr 3rem; */
+    }
+}
+
+.orderNumberContainer {}
+
+.orderDateContainer {
+    composes: gap-y-1 from global;
+    composes: grid from global;
+    composes: overflow-hidden from global;
+    composes: p-sm from global;
+}
+
+.orderTotalContainer {
+    composes: border-0 from global;
+    composes: border-b from global;
+    composes: border-l from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: gap-y-1 from global;
+    composes: grid from global;
+    composes: overflow-hidden from global;
+    composes: p-sm from global;
+
+    composes: lg_border-b-0 from global;
+}
+
+.orderStatusContainer {
+    composes: border-0 from global;
+    composes: border-l-0 from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: col-end-span2 from global;
+    composes: gap-y-1 from global;
+    composes: grid from global;
+    composes: overflow-hidden from global;
+    composes: p-sm from global;
+
+    composes: lg_border-b-0 from global;
+    composes: lg_border-l from global;
+    composes: lg_col-end-auto from global;
+    composes: lg_gap-y-3 from global;
+}
+
+.orderItemsContainer {
+    composes: border-0 from global;
+    composes: border-b from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: col-end-span2 from global;
+    composes: overflow-hidden from global;
+    composes: p-0 from global;
+    composes: py-sm from global;
+
+    composes: lg_border-0 from global;
+    composes: lg_border-l from global;
+    composes: lg_col-end-auto from global;
+    composes: lg_p-0 from global;
+}
+
+.contentToggleContainer {
+    composes: border-0 from global;
+    composes: border-l from global;
+    composes: border-solid from global;
+    composes: border-subtle from global;
+    composes: col-start-2 from global;
+    composes: justify-self-end from global;
+    composes: overflow-hidden from global;
+    composes: px-xs from global;
+    composes: py-0 from global;
+    composes: row-start-1 from global;
+
+    composes: lg_border-l from global;
+    composes: lg_col-start-6 from global;
+    composes: lg_px-xs from global;
+    composes: lg_row-start-1 from global;
+}
+
+.orderNumberLabel,
+.orderDateLabel,
+.orderTotalLabel {
+    composes: text-2xs from global;
+}
+
+.orderNumber,
+.orderDate,
+.orderTotal {
+    composes: font-bold from global;
+}
+
+.orderStatusBadge {
+    /* composes: border from global;
+    composes: border-solid from global;
+    composes: border-subtle from global; */
+    composes: font-bold from global;
+    composes: justify-self-start from global;
+    composes: px-xs from global;
+    composes: py-1 from global;
+    /* composes: rounded-md from global; */
+    composes: text-2xs from global;
+}
+
+.content {
+    composes: border-t from global;
+    composes: border-solid from global;
+    composes: border-gray-100 from global;
+    /* composes: p-sm from global; */
+    grid-column: 1 / -1;
+}
+
+.content_collapsed {
+    composes: hidden from global;
+}
+
+@media (max-width: 959px) {
+
+    /* TODO @TW: cannot compose */
+    .orderItemsContainer:empty {
+        display: none;
+    }
+
+    .orderNumberContainer {
+        grid-column: 1 / span 2;
+        grid-row: 1;
+    }
+}
+
+.productName {
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    line-height: normal;
+}