Attachment #133517 for bug #28082

View | Details | Raw Unified | Return to bug 28082
Collapse All | Expand All

Lines 92-97 if ( $supplier_count == 1 ) { Link Here

(-)a/acqui/booksellers.pl (+3 lines)
92	supplier_name => $suppliers[0]->name,	92	supplier_name => $suppliers[0]->name,
93	booksellerid => $suppliers[0]->id,	93	booksellerid => $suppliers[0]->id,
94	basketcount => $suppliers[0]->baskets->count,	94	basketcount => $suppliers[0]->baskets->count,
		95	subscriptionscount => $suppliers[0]->subscriptions->count,
95	active => $suppliers[0]->active,	96	active => $suppliers[0]->active,
96	);	97	);
97	}	98	}
Lines 149-154 for my $vendor (@suppliers) { Link Here
149	booksellerid => $vendor->id,	150	booksellerid => $vendor->id,
150	name => $vendor->name,	151	name => $vendor->name,
151	active => $vendor->active,	152	active => $vendor->active,
		153	basketcount => $vendor->baskets->count,
		154	subscriptioncount => $vendor->subscriptions->count,
152	};	155	};
153		156
154	}	157	}

Lines 89-96 if ( $op eq 'display' ) { Link Here

(-)a/acqui/supplier.pl (-2 / +2 lines)
89	);	89	);
90	} elsif ( $op eq 'delete' ) {	90	} elsif ( $op eq 'delete' ) {
91	# no further message needed for the user	91	# no further message needed for the user
92	# the DELETE button only appears in the template if basketcount == 0	92	# the DELETE button only appears in the template if basketcount == 0 AND subscriptioncount == 0
93	if ( $supplier->baskets->count == 0 ) {	93	if ( $supplier->baskets->count == 0 && $supplier->subscriptions->count == 0) {
94	Koha::Acquisition::Booksellers->find($booksellerid)->delete;	94	Koha::Acquisition::Booksellers->find($booksellerid)->delete;
95	}	95	}
96	print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');	96	print $query->redirect('/cgi-bin/koha/acqui/acqui-home.pl');




}

#acqui_order_supplierlist {
    .supplier {
        &+.supplier {
            border-top: 1px solid #EEEEEE;
            margin-top: 1em;
            padding: 1em;
        }
    }

    .suppliername {
        display: inline-block;
        margin: .5em 1em .5em 0;
            }
        }

        &.inactive {
            color: #888;
                margin-left: 5em;
            }

            a:link,
            a:visited {
                color: #888;
                margin-bottom: .5em;
            }
        }
    }

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc (-10 / +11 lines)
1	[% INCLUDE 'blocking_errors.inc' %]	1	[% INCLUDE 'blocking_errors.inc' %]
2	<!-- acquisitions-toolbar.inc -->	2	<!-- acquisitions-toolbar.inc -->
3	<script>
4	function confirm_deletion() {
5	if (confirm(_("Are you sure you want to delete this vendor?"))) {
6	window.location="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]&op=delete";
7	}
8	}
9	</script>
10	<div id="toolbar" class="btn-toolbar">	3	<div id="toolbar" class="btn-toolbar">
11	[% IF ( booksellerid ) %]	4	[% IF ( booksellerid ) %]
12	<div class="btn-group">	5	<div class="btn-group">
Lines 26-37 Link Here
26	</ul>	19	</ul>
27	</div>	20	</div>
28	[% IF ( CAN_user_acquisition_vendors_manage ) %]	21	[% IF ( CAN_user_acquisition_vendors_manage ) %]
29	<div class="btn-group"><a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a></div>	22	<div class="btn-group">
		23	<a class="btn btn-default" id="editsupplier" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid \| html %]&op=enter"><i class="fa fa-pencil"></i> Edit vendor</a>
		24	</div>
30	[% UNLESS ( basketcount OR subscriptioncount ) %]	25	[% UNLESS ( basketcount OR subscriptioncount ) %]
31	<div class="btn-group"><a class="btn btn-default" id="deletesupplier" href="javascript:confirm_deletion()"><i class="fa fa-trash"></i> Delete vendor</a></div>	26	<div class="btn-group">
		27	<form action="/cgi-bin/koha/acqui/supplier.pl" method="post">
		28	<input type="hidden" name="op" value="delete" />
		29	<input type="hidden" name="booksellerid" value="[% booksellerid \| html %]" />
		30	<button class="btn btn-default" id="deletesupplier" type="submit"><i class="fa fa-trash"></i> Delete vendor</button>
		31	</form>
		32	</div>
32	[% END %]	33	[% END %]
33	[% END %]	34	[% END %]
34	[% IF CAN_user_acquisition_order_receive && basketcount %]	35	[% IF CAN_user_acquisition_order_receive && basketcount && active %]
35	<div class="btn-group"><a class="btn btn-default" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid \| html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div>	36	<div class="btn-group"><a class="btn btn-default" id="receive" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid \| html %]"><i class="fa fa-inbox"></i> Receive shipments</a></div>
36	[% END %]	37	[% END %]
37	[% ELSE %]	38	[% ELSE %]




            [% END %]
        </select>
        </p>
        [% IF ( allbaskets ) %]
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]">Show active baskets only</a>
        [% ELSE %]
            <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1">Show all baskets</a>
        [% END %]
    [% END %]
    [% UNLESS booksellerid %]
        | <a href="#" id="show_active_vendors">Show active vendors only</a><a href="#" id="show_all_vendors">Show all vendors</a>

            [% ELSE %]
                <div class="supplier inactive">
            [% END %]
                [% IF ( supplier.active ) %]
                    <h2 class="suppliername">
                [% ELSE %]
                    <h2 class="suppliername inactive">
                [% END %]
                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">
                            [% IF (supplier.name) %]
                                [% supplier.name | html %]
                            [% ELSE %]
                                NO NAME
                            [% END %]
                        </a>
                        <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]"></a>
                    [% IF ( !supplier.active ) %]<span class="vendor_inactive">(inactive)</span>[% END %]
                </h2>
                <span class="basketcounts">
                    [% IF ( count > 1 ) %]
                        <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% supplier.booksellerid | uri %]">[% supplier.basketcount | html %] [% tn('basket', 'baskets', supplier.basketcount) | $raw %]</a>,
                    [% ELSE %]
                        [% supplier.basketcount | html %] [% tn('basket', 'baskets', supplier.basketcount) | $raw %],
                    [% END %]
                    [% IF supplier.subscriptioncount > 0 %]
                        <a href="/cgi-bin/koha/serials/serials-search.pl?bookseller_filter=[% supplier.name | uri %]&searched=1">
                            [% supplier.subscriptioncount | html %] [% tn('subscription', 'subscriptions', supplier.subscriptioncount) | $raw %]
                        </a>
                    [% ELSE %]
                        [% supplier.subscriptioncount | html %] [% tn('subscription', 'subscriptions', supplier.subscriptioncount) | $raw %]
                            (inactive)
                        [% END %]
                    [% END %]
                        [% IF ( supplier.loop_basket.size ) %]
                    <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid | uri %]"><i class="fa fa-inbox"></i> Receive shipment</a>
                        [% END %]
                </span>
                [% IF ( count == 1 ) %]
                    [% IF ( supplier.basketcount > 0 ) %]
                        <div>
                            [% IF ( allbaskets ) %]
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]">Show active baskets only</a>
                            [% ELSE %]
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier.booksellerid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;allbaskets=1">Show all baskets</a>
                            [% END %]
                        </div>
                    [% END %]
                [% ELSE %]
                    [% INCLUDE "acquisitions-toolbar.inc" booksellerid=supplier.booksellerid active=supplier.active basketcount=supplier.loop_basket.size basketcount=supplier.basketcount subscriptioncount=supplier.subscriptioncount %]
                [% END %]

                <div class="baskets">
                    [% IF ( supplier.loop_basket.size ) %]
                        <table class="baskets">

                        </table>

                    [% ELSE %]
                        <p>
                            No pending baskets.
                            [% IF ( supplier.basketcount > 0 && count > 1 ) %]
                                <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=1&booksellerid=[% supplier.booksellerid | uri %]&allbaskets=1">View all baskets</a>.
                            [% END %]
                        </p>

                    [% END %][%# IF ( supplier.loop_basket.size ) %]
                </div>
            </div>

Lines 431-436 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt (+1 lines)
431	[% MACRO jsinclude BLOCK %]	431	[% MACRO jsinclude BLOCK %]
432	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	432	[% Asset.js("js/acquisitions-menu.js") \| $raw %]
433	[% Asset.js("lib/hc-sticky.js") \| $raw %]	433	[% Asset.js("lib/hc-sticky.js") \| $raw %]
		434	[% Asset.js("js/acq.js") \| $raw %]
434	[% INCLUDE 'datatables.inc' %]	435	[% INCLUDE 'datatables.inc' %]
435	<script>	436	<script>
436	function confirm_deletion() {	437	function confirm_deletion() {

Lines 166-171 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt (+1 lines)
166		166
167	[% MACRO jsinclude BLOCK %]	167	[% MACRO jsinclude BLOCK %]
168	[% Asset.js("js/acquisitions-menu.js") \| $raw %]	168	[% Asset.js("js/acquisitions-menu.js") \| $raw %]
		169	[% Asset.js("js/acq.js") \| $raw %]
169	[% INCLUDE 'datatables.inc' %]	170	[% INCLUDE 'datatables.inc' %]
170	<script>	171	<script>
171	$(document).ready(function() {	172	$(document).ready(function() {

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/acq.js (-1 / +9 lines)
		1	/* global confirmDelete */
		2	/* exported uncheckbox isNotNull isNull isNum log calcTotalRow autoFillRow messenger updateCosts calcNewsuggTotal getAuthValueDropbox totalExceedsBudget budgetExceedsParent checkBudgetParent hideColumn showColumn showAllColumns hideAllColumns */
		3
1	//=======================================================================	4	//=======================================================================
2	//input validation:	5	//input validation:
3	// acqui/uncertainprice.tmpl uses this	6	// acqui/uncertainprice.tmpl uses this
Lines 380-382 function hideAllColumns(){ Link Here
380	$("#plan td:nth-child(2),#plan th:nth-child(2)").nextUntil("th:nth-child("+(allCols-1)+"),td:nth-child("+(allCols-1)+")").hide(); // hide all but the last two columns	383	$("#plan td:nth-child(2),#plan th:nth-child(2)").nextUntil("th:nth-child("+(allCols-1)+"),td:nth-child("+(allCols-1)+")").hide(); // hide all but the last two columns
381	$("#hideall").prop("checked", true).parent().addClass("selected");	384	$("#hideall").prop("checked", true).parent().addClass("selected");
382	}	385	}
383	-	386
		387	$(document).ready(function(){
		388	$("#deletesupplier").on("click", function(){
		389	confirmDelete(__("Are you sure you want to delete this vendor?") );
		390	});
		391	});

Return to bug 28082

Lines 2714-2741 td { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-18 / +13 lines)
2714	}	2714	}
2715		2715
2716	#acqui_order_supplierlist {	2716	#acqui_order_supplierlist {
2717	> div {	2717	.supplier {
2718	&.supplier {	2718	&+.supplier {
2719	border: 1px solid #EEEEEE;	2719	border-top: 1px solid #EEEEEE;
2720	margin: .5em;	2720	margin-top: 1em;
2721	padding: 1em;
2722	}	2721	}
		2722	}
2723		2723
2724	> div {	2724	.suppliername {
2725	> .baskets {	2725	display: inline-block;
2726	margin-top: .5em;	2726	margin: .5em 1em .5em 0;
2727	}
2728	}
2729		2727
2730	> span {	2728	&.inactive {
2731	&.action {	2729	color: #888;
2732	margin-left: 5em;
2733	}
2734		2730
2735	&.suppliername {	2731	a:link,
2736	display: inline;	2732	a:visited {
2737	font-size: 1.7em;	2733	color: #888;
2738	margin-bottom: .5em;
2739	}	2734	}
2740	}	2735	}
2741	}	2736	}