Skip to content
Code-Schnipsel Gruppen Projekte
Commit 5e019173 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

fix: adjust template to the latest quiqqer/order changes 

Related: #119
Übergeordneter dbff1739
No related branches found
No related tags found
2 Merge Requests!25Update 'next-3.x' with latest changes from 'main',!24fix: adjust paths to standard mail templates in quiqqer/core
Pipeline #15562 mit Warnungen bestanden mit Phase
Phase:
    in 47 Sekunden
    Leerzeichenänderungen ausblenden
    Inline Nebeneinander
    bin/css/user-orders.css gelöscht 100644 → 0
    + 0
    − 198
    Zeige Datei @ dbff1739
    section.quiqqer-order-profile-orders-order {
    margin-bottom: 2em;
    }
    .quiqqer-order-profile-orders-order-header-orderId {
    float: left;
    position: relative;
    width: 25%;
    }
    .quiqqer-order-profile-orders-order-header-date,
    .quiqqer-order-profile-orders-order-header-total,
    .quiqqer-order-profile-orders-order-header-addressInvoice,
    .quiqqer-order-profile-orders-order-header-addressDelivery,
    .quiqqer-order-profile-orders-order-header-orderId {
    padding: 0 10px;
    }
    .quiqqer-order-profile-orders-order-header-date {
    padding-left: 0;
    }
    .quiqqer-order-profile-orders-order-header-orderId {
    padding-right: 0;
    }
    .quiqqer-order-profile-orders-order-header-date > span:first-child,
    .quiqqer-order-profile-orders-order-header-total > span:first-child,
    .quiqqer-order-profile-orders-order-header-addressInvoice > span:first-child,
    .quiqqer-order-profile-orders-order-header-addressDelivery > span:first-child,
    .quiqqer-order-profile-orders-order-header-orderId > span:first-child {
    display: block;
    }
    /**
    1. avoid !important and increase the specificity (not good)
    2. set address position at the bottom line 100% height + 10px padding of "header"
    */
    .quiqqer-order-profile-orders-order-header-addressInvoice address:is(address) { /* 1 */
    top: calc(100% + 10px); /* 2 */
    }
    .quiqqer-order-profile-orders-order-header-addressInvoice span {
    align-items: center;
    display: flex;
    max-width: 100%;
    }
    .quiqqer-order-profile-orders-order-header-addressInvoice > span > span {
    display: block;
    max-width: 100%;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
    }
    .quiqqer-order-profile-orders-order-header-addressInvoice .fa {
    margin-left: 5px;
    }
    .quiqqer-order-profile-orders-order-articles {
    background: #fff;
    }
    .quiqqer-order-profile-orders-order-articles-article {
    border-bottom: 1px dashed #ddd;
    padding: 2em 0;
    }
    .quiqqer-order-profile-orders-order-articles-article:last-child {
    border-bottom: none;
    }
    .quiqqer-order-profile-orders-order-articles-article {
    align-items: start;
    border-bottom: 1px dashed #ddd;
    display: grid;
    grid-column-gap: 20px;
    grid-template-columns: 25% auto;
    grid-template-rows: auto;
    justify-items: start;
    padding: 2em 0;
    }
    .quiqqer-order-profile-orders-order-articles-image {
    align-items: flex-start;
    align-self: start;
    border-right: 1px dashed #ddd;
    display: flex;
    grid-row: 1 / 5;
    justify-content: center;
    padding: 20px;
    width: 100%;
    }
    .quiqqer-order-profile-orders-order-articles-information {
    padding-top: 0 !important;
    }
    .quiqqer-order-profile-orders-order-articles-title {
    color: inherit;
    font-size: 1.75em;
    }
    .quiqqer-order-profile-orders-order-articles-description {
    margin: 5px 0;
    color: #9ba3ad;
    }
    .quiqqer-order-profile-orders-order-articles-price {
    font-size: 1.2em;
    font-weight: 500;
    padding-bottom: 10px;
    }
    .quiqqer-order-profile-orders-order-articles-rebuy {
    align-self: end;
    }
    /**********/
    /* footer */
    /**********/
    .quiqqer-order-profile-orders-order footer {
    display: flex;
    justify-content: space-between;
    }
    .quiqqer-order-profile-orders-order footer .quiqqer-order-profile-orders-order-footer-paymentType {
    margin-top: 0;
    }
    .quiqqer-order-profile-orders-order-footer-rightWrapper {
    display: flex;
    align-items: center;
    }
    @media (max-width: 768px) {
    /***********************/
    /* article list header */
    /***********************/
    .quiqqer-order-profile-orders-order-header-date, .quiqqer-order-profile-orders-order-header-total, .quiqqer-order-profile-orders-order-header-addressInvoice, .quiqqer-order-profile-orders-order-header-addressDelivery, .quiqqer-order-profile-orders-order-header-orderId {
    padding: 0;
    margin-bottom: 10px;
    }
    .quiqqer-order-profile-orders-order-header-orderId {
    margin: 0 !important;
    }
    .quiqqer-order-profile-orders-order-header-date > span:first-child, .quiqqer-order-profile-orders-order-header-total > span:first-child, .quiqqer-order-profile-orders-order-header-addressInvoice > span:first-child, .quiqqer-order-profile-orders-order-header-addressDelivery > span:first-child, .quiqqer-order-profile-orders-order-header-orderId > span:first-child {
    padding-right: 5px;
    }
    /****************/
    /* article list */
    /****************/
    .quiqqer-order-profile-orders-order-articles-article {
    display: block;
    padding: 3em 0;
    }
    .quiqqer-order-profile-orders-order-articles-image {
    border-bottom: 1px dashed #ddd;
    border-right: none;
    float: none !important;
    margin: 0 0 20px 0;
    }
    .quiqqer-order-profile-orders-order-articles-price {
    padding-top: 10px;
    }
    .quiqqer-order-profile-orders-order-articles-rebuy{
    display: block;
    margin: 0 auto;
    max-width: 340px;
    width: 100%;
    }
    /**********/
    /* footer */
    /**********/
    .quiqqer-order-profile-orders-order footer {
    display: block;
    }
    .quiqqer-order-profile-orders-order footer .quiqqer-order-profile-orders-order-footer-rightWrapper .btn {
    padding-left: 3px;
    padding-right: 3px;
    }
    }
    /****************/
    /* Invoice list */
    /****************/
    .quiqqer-invoice-profile-invoices-table-invoice {
    background: #fff;
    }
    \ No newline at end of file
    bin/css/variables.css
    + 1
    − 0
    Zeige Datei @ 5e019173
    ......@@ -18,6 +18,7 @@
    --bg-secondary: #f5f5f5;
    --_qui-cologne-header-height: 100px;
    --_qui-template-scrollMarginTop: var(--qui-template-scrollMarginTop, var(--_qui-cologne-header-height));
    --_qui-cologne-theme-border-color: var(--qui-cologne-theme-border-color, #ddd);
    --_qui-cologne-theme-border-width: var(--qui-cologne-theme-border-width, 1px);
    ......
    composer.json
    + 1
    − 1
    Zeige Datei @ 5e019173
    ......@@ -20,7 +20,7 @@
    "quiqqer/core": "^2",
    "quiqqer/erp": "^3",
    "quiqqer/products": "^2",
    "quiqqer/order": "^2.7.7",
    "quiqqer/order": "^2.7.23",
    "quiqqer/product-bricks": "^2",
    "quiqqer/frontend-users": "^2",
    "quiqqer/menu": "^3",
    ......
    quiqqer/order/src/QUI/ERP/Order/FrontendUsers/Controls/UserOrders.Order.html gelöscht 100644 → 0
    + 0
    − 87
    Zeige Datei @ dbff1739
    <section class="quiqqer-order-profile-orders-order">
    <header>
    <div class="quiqqer-order-profile-orders-order-header-date">
    <span class="text-muted text-small">{locale group="quiqqer/order" var="control.profile.orders.order.date"}</span>
    <span>{$Order->getCreateDate()}</span>
    </div>
    <div class="quiqqer-order-profile-orders-order-header-total">
    <span class="text-muted text-small">{locale group="quiqqer/order" var="control.profile.orders.order.total"}</span>
    <span>{$order.calculations.display_sum}</span>
    </div>
    <div class="quiqqer-order-profile-orders-order-header-addressInvoice">
    <span class="text-muted text-small">{locale group="quiqqer/order" var="control.profile.orders.order.invoiceAddress"}</span>
    {if $Invoice}
    {assign var=Customer value=$Invoice->getCustomer()}
    {else}
    {assign var=Customer value=$Order->getCustomer()}
    {/if}
    {assign var=Address value=$Customer->getAddress()}
    {$Address->render(['tel' => false, 'mail' => false])}
    <span>
    <span>{$Address->getName()}</span>
    <span class="fa fa-angle-down"></span>
    </span>
    </div>
    <div class="quiqqer-order-profile-orders-order-header-orderId">
    <span class="text-muted text-small">{locale group="quiqqer/order" var="control.profile.orders.order.orderNo"}</span>
    <a href="{$Utils->getOrderUrl($Project, $Order)}"
    target="_blank"
    data-hash="{$Order->getHash()}"
    title="{locale group='quiqqer/order' var='control.order.details.title'}"
    >
    {$Order->getId()}
    </a>
    </div>
    </header>
    <div class="quiqqer-order-profile-orders-order-articles">
    {foreach $articles as $Article}
    {$this->renderArticle($Article)}
    {/foreach}
    </div>
    <footer>
    <div class="quiqqer-order-profile-orders-order-footer-leftWrapper">
    {if $Payment}
    <div class="quiqqer-order-profile-orders-order-footer-paymentType">
    <span class="text-muted text-small">{locale group="quiqqer/order" var="control.profile.orders.order.paymentMethod"}:</span>
    <span>{$Payment->getTitle()}</span>
    </div>
    {/if}
    {if isset($orderStatus)}
    <div class="quiqqer-order-profile-orders-order-footer-orderStatus">
    <span class="text-muted text-small">{locale group="quiqqer/order" var="control.profile.orders.order.orderStatus"}:</span>
    <span>{$orderStatus}</span>
    </div>
    {/if}
    {if !empty($shippingStatus)}
    <div class="quiqqer-order-profile-orders-order-footer-shipping">
    <span class="text-muted text-small">{locale group="quiqqer/shipping" var="control.profile.orders.shipping"}:</span>
    <span>{$shippingStatus}</span>
    </div>
    {/if}
    </div>
    <div class="quiqqer-order-profile-orders-order-footer-rightWrapper">
    {if $Order->isPosted() && $Order->getInvoiceType() === 'QUI\ERP\Accounting\Invoice\Invoice'}
    <a href="{$Order->getAttribute('downloadLink')}" target="_blank"
    class="btn btn-link-dark">
    <span class="fa fa-file-pdf-o"></span>
    <span>{locale group="quiqqer/order" var="control.profile.orders.order.invoice"}</span>
    </a>
    {else if !$Order->isSuccessful()}
    <a href="{$orderUrl}" target="_blank"
    class="btn btn-link-dark">
    <span class="fa fa-shopping-basket"></span>
    <span>{locale group="quiqqer/order" var="control.profile.orders.order.continuePayment"}</span>
    </a>
    {/if}
    </div>
    </footer>
    </section>
    template/head/styles.html
    + 0
    − 1
    Zeige Datei @ 5e019173
    ......@@ -13,7 +13,6 @@
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/products.css')}"/>
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/frontend-users.css')}"/>
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/order.css')}"/>
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/user-orders.css')}"/>
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/controls.css')}"/>
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/mini-basket.css')}"/>
    <link rel="stylesheet" href="{$Template->getTemplateUrl('bin/css/product-bricks.css')}"/>
    ......
    0% oder .
    You are about to add 0 people to the discussion. Proceed with caution.
    Bearbeitung dieser Nachricht zuerst beenden!
    Bitte registrieren oder zum Kommentieren

    PCSG & QUIQQER support and DEV System - GitLab