Attachment 142412 Details for Bug 31822 – Bug 31822: Add page-section to vendoer details page

[patch] Bug 31822: Add page-section to vendoer details page

Bug-31822-Add-page-section-to-vendoer-details-page.patch (text/plain), 7.32 KB, created by Martin Renvoize (ashimema) on 2022-10-21 16:02:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-10-21 16:02:00 UTC

Size: 7.32 KB

patch

obsolete

>From 2e2a773ea4ec3de5ec325cb7e97d4d9ba8f424c1 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 21 Oct 2022 17:00:55 +0100
>Subject: [PATCH] Bug 31822: Add page-section to vendoer details page
>
>This patch contains whitespace changes which an be safely ignored.
>---
> .../prog/en/modules/acqui/supplier.tt         | 91 +++++++++----------
> 1 file changed, 42 insertions(+), 49 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 40929da425..934b18be67 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -322,59 +322,53 @@
> [% ELSE %]
>     <h1>[% name | html %]</h1>
>         <div class="row">
>-            <div id="supplier-company-details" class="col-sm-6">
>-                <h2>Vendor details</h2>
>-                <p><span class="label">Type: </span>[% type | html %]</p>
>-                <p><span class="label">Company name: </span>[% name | html %]</p>
>-                <p><span class="label">Postal address: </span>[% postal | html %]</p>
>-                <p><span class="label">Physical address: </span>[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</p>
>-                <p><span class="label">Phone: </span>[% phone | html %]</p>
>-                <p><span class="label">Fax: </span>[% fax | html %]</p>
>-                [% IF ( url ) %]
>-                    <p><span class="label">Website: </span><a href="[% url | url %]">[% url | html %]</a></p>
>-                [% END %]
>-                [% IF ( accountnumber ) %]
>-                    <p><span class="label">Account number: </span>[% accountnumber | html %]</p>
>-                [% END %]
>+            <div class="col-sm-6">
>+                <div id="supplier-company-details" class="page-section">
>+                    <h2>Vendor details</h2>
>+                    <p><span class="label">Type: </span>[% type | html %]</p>
>+                    <p><span class="label">Company name: </span>[% name | html %]</p>
>+                    <p><span class="label">Postal address: </span>[% postal | html %]</p>
>+                    <p><span class="label">Physical address: </span>[% address1 | html %][% address2 | html %][% address3 | html %][% address4 | html %]</p>
>+                    <p><span class="label">Phone: </span>[% phone | html %]</p>
>+                    <p><span class="label">Fax: </span>[% fax | html %]</p>
>+                    [% IF ( url ) %]
>+                        <p><span class="label">Website: </span><a href="[% url | url %]">[% url | html %]</a></p>
>+                    [% END %]
>+                    [% IF ( accountnumber ) %]
>+                        <p><span class="label">Account number: </span>[% accountnumber | html %]</p>
>+                    [% END %]
>+                </div> 
> 
>-            <div id="supplier-ordering-information">
>-            <h2>Ordering information</h2>
>-                <p><strong>Vendor is: </strong>
>-                        [% IF ( active ) %]
>-                            Active
>-                        [% ELSE %]
>-                            Inactive
>-                        [% END %]</p>
>-                <p><strong>List prices are: </strong>[% listprice | html %]</p>
>-                <p><strong>Invoice prices are: </strong>[% invoiceprice | html %]</p>
>-                [% IF ( tax_rate ) %]<p><strong>Tax number registered: </strong>
>-                        [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
>-                <p><strong>List item price includes tax: </strong>
>-                        [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
>-                <p><strong>Invoice item price includes tax: </strong>
>-                        [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
>-                <p><strong>Discount: </strong>
>-                    [% discount | format("%.1f") %] %</p>
>-                <p><strong>Tax rate: </strong>
>-                    [% ( tax_rate || 0 ) * 100 | html %] %</p>
>-                [% IF deliverytime.defined %]
>-                    <p><strong>Delivery time: </strong>
>-                        [% deliverytime | html %] days</p>
>-                [% END %]
>-                [% IF ( notes ) %]<p><strong>Notes: </strong>
>-                    [% notes | html %]</p>[% END %]
>-            </div> 
>+                <div id="supplier-ordering-information" class="page-section">
>+                    <h2>Ordering information</h2>
>+                    <p><strong>Vendor is: </strong>[% IF ( active ) %]Active[% ELSE %]Inactive[% END %]</p>
>+                    <p><strong>List prices are: </strong>[% listprice | html %]</p>
>+                    <p><strong>Invoice prices are: </strong>[% invoiceprice | html %]</p>
>+                    [% IF ( tax_rate ) %]
>+                        <p><strong>Tax number registered: </strong>[% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
>+                        <p><strong>List item price includes tax: </strong>[% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
>+                        <p><strong>Invoice item price includes tax: </strong>[% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>
>+                    [% END %]
>+                    <p><strong>Discount: </strong>[% discount | format("%.1f") %] %</p>
>+                    <p><strong>Tax rate: </strong>[% ( tax_rate || 0 ) * 100 | html %] %</p>
>+                    [% IF deliverytime.defined %]
>+                        <p><strong>Delivery time: </strong>[% deliverytime | html %] days</p>
>+                    [% END %]
>+                    [% IF ( notes ) %]
>+                        <p><strong>Notes: </strong>[% notes | html %]</p>
>+                    [% END %]
>+                </div> 
>             </div> 
> 
>             <div class="col-sm-6">
>-                <div class="supplier-contact-details">
>+                <div id="supplier-contact-details" class="page-section">
>                     <h2>Contact</h2>
>                     [% FOREACH contact IN contacts %]
>                         [% INCLUDE show_contact %]
>                     [% END %]
>-                </div>
>+                </div> 
> 
>-                <div class="subscription-details">
>+                <div id="subscription-details" class="page-section">
>                     <h2>Subscription details</h2>
>                     <p><strong>Number of subscriptions: </strong>
>                         [% IF (  CAN_user_serials ) %]
>@@ -383,14 +377,13 @@
>                             [% subscriptioncount | html %]
>                         [% END %]
>                     </p>
>-                </div>
>-
>-            </div>
>+                </div> 
>+            </div> 
> 
>         </div>
> 
>         [% IF ( contracts ) %]
>-            <div id="supplier-contracts">
>+            <div id="supplier-contracts" class="page-section">
>                 <h2>Contract(s)</h2>
>                 <table id="contractst">
>                   <thead>
>@@ -423,7 +416,7 @@
>                     [% END %]
>                   </tbody>
>                 </table>
>-            </div>
>+            </div> 
>         [% END %]
> 
> [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31822: 142412 | 142463