X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Facqui%2Fbasketgroup.tt;h=03520713a10926aa09b773694358a62f1df5f8e2;hb=fc250be5385f9bac3e0c92034102e43e7073ce15;hp=d4027a5c0ac64173158ef19c74520ab9dc8c5018;hpb=e86a9516177045a77285c8baf8eb0b991b8636a7;p=koha_fer

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
index d4027a5c0a..03520713a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -1,4 +1,4 @@
-[% USE KohaBranchName %]
+[% USE Branches %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
@@ -20,10 +20,6 @@
   element position and are not recommended;
   we turn them off as a foundation for YUI
   CSS treatments. */
-body {
-	margin:0;
-	padding:0;
-}
 #basketgroupcolumns {
     width: 58em;
 }
@@ -144,10 +140,25 @@ function submitForm(form) {
     <div class="yui-b">
 
 [% IF ( grouping ) %]
+    [% IF (closedbg) %]
+        <div id="toolbar" class="btn-toolbar">
+            <div class="btn-group"><a href="[% script_name %]?op=reopen&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]&amp;mode=singlebg" class="btn btn-small" id="reopenbutton"><i class="icon-download"></i> Reopen this basket group</a></div>
+            <div class="btn-group"><a href="[% script_name %]?op=export&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="exportbutton"><i class="icon-download"></i> Export this basket group as CSV</a></div>
+            <div class="btn-group"><a href="[% script_name %]?op=print&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="printbutton"><i class="icon-download"></i> Print this basket group in PDF</a></div>
+        </div>
+    [% ELSE %]
+    <div class="btn-group"><a href="[% script_name %]?op=delete&amp;basketgroupid=[% basketgroupid %]&amp;booksellerid=[% booksellerid %]" class="btn btn-small" id="delbutton"><i class="icon-remove"></i> Delete basket group</a></div>
+    [% END %]
+    [% IF (name && closedgb) %]
+        <h1>Basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+    [% ELSIF (name) %]
+        <h1>Edit basket group [% name %] ([% basketgroupid %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+    [% ELSE %]
     <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername |html %]</a></h1>
+    [% END %]
         <div id="basketgroupcolumns" class="yui-g">
+        [% UNLESS (closedbg) %]
 		    <div class="yui-u">
-
 				<form action="[% scriptname %]" method="post" name="basketgroups" id="basketgroups">
 	            <div id="groups">
 	            <fieldset class="brief">
@@ -174,39 +185,82 @@ function submitForm(form) {
 	            </fieldset>
 	            </div>
 	            </form>
-
 			</div> 
-			
+       [% END %]
 		    <div class="yui-u first"> 
 		    	<form action="" method="post" id="groupingform" onsubmit="return submitForm(this)">
 					<fieldset id="various" class="brief">
 					<ol>
+                    [% UNLESS (closedbg) %]
                         <li><label for="basketgroupname">Basket group name:</label>
-							<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
-                        <li><label for="billingplace">Billing place:</label>
+                                                       <input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" class="focus" /></li>
+                    [% ELSE %]
+                        <input type="hidden" name="basketgroupname" id="basketgroupname" value="[% name %]" />
+                    [% END %]
+                        <li>
+                            [% UNLESS (closedbg) %]
+                            <label for="billingplace">Billing place:</label>
 							<select name="billingplace" id="billingplace" style="width:13em;">
                                 <option value="">--</option>
 								[% FOREACH billingplaceloo IN billingplaceloop %]
 	                                [% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
 	                                [% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
 								[% END %]
-												</select></li>
-                        <li><label for="deliveryplace">Delivery place:</label>
+                                </select>
+                            [% ELSE %]
+                                <span class="label">Billing place:</span>
+                                [% FOREACH billingplaceloo IN billingplaceloop %]
+                                    [% IF ( billingplaceloo.selected ) %]
+                                        <input name="billingplace" id="billingplace" type ="hidden" value="[% billingplaceloo.value %]" />[% billingplaceloo.branchname %]
+                                    [% END %]
+                                [% END %]
+                            [% END %]
+                        </li>
+                        [% UNLESS (closedbg) %]
+                            <li>
+                                <label for="deliveryplace">Delivery place:</label>
 							<select name="deliveryplace" id="deliveryplace" style="width:13em;">
 								<option value="">--</option>
 								[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
 	                                [% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>
 	                                [% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
 								[% END %]
-												</select></li>
+                                <select>
+                            </li>
                         <li><p>or</p></li>
                         <li><label for="freedeliveryplace">Delivery place:</label>
                             <textarea cols="26" rows="3" name="freedeliveryplace" id="freedeliveryplace">[% freedeliveryplace %]</textarea></li>
-						<li><label for="deliverycomment">Delivery comment:</label>
-							<textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
+                        [% ELSE %]
+                            <li>
+                                <span class="label">Delivery place:</span>
+                                [% IF (freedeliveryplace) %]
+                                    <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="[% freedeliveryplace %]" />[% freedeliveryplace %]
+                                    <input name="deliveryplace" id="deliveryplace" type ="hidden" value="" />
+                                [% ELSE %]
+                                    [% FOREACH deliveryplaceloo IN deliveryplaceloop %]
+                                        [% IF ( deliveryplaceloo.selected ) %]
+                                            <input name="deliveryplace" id="deliveryplace" type ="hidden" value="[% deliveryplaceloo.value %]" />[% deliveryplaceloo.branchname %]
+                                        [% END %]
+                                    [% END %]
+                                    <input name="freedeliveryplace" id="freedeliveryplace" type ="hidden" value="" />
+                                [% END %]
+                            </li>
+                        [% END %]
+                        <li>
+                            [% UNLESS (closedbg) %]
+                                <label for="deliverycomment">Delivery comment:</label>
+                                <textarea cols="26" rows="3" name="deliverycomment" id="deliverycomment">[% deliverycomment %]</textarea>
+                            [% ELSE %]
+                                <span class="label">Delivery comment:</span>[% deliverycomment %]
+                                <input name="deliverycomment" id="deliverycomment" type="hidden" value = "[% deliverycomment %]" />
+                            [% END %]
 						</li>
 						<li><span class="label">Baskets in this group:</span>
+                            [% UNLESS (closedbg) %]
 							<ul class="draglist" id="bg">
+                            [% ELSE %]
+                                <ul>
+                            [% END %]
 								[% FOREACH selectedbasket IN selectedbaskets %]
 				                    <li class="grouped" id="b-[% selectedbasket.basketno %]" >
 				                        <a href="basket.pl?basketno=[% selectedbasket.basketno %]">
@@ -222,10 +276,14 @@ function submitForm(form) {
 			                    [% END %]
 							</ul>
 						</li>
-						<li><label><input type="checkbox" id="close" name="close" /> Close basket group</label></li>
+                       [% UNLESS (closedbg) %]
+                        <li><label><input type="checkbox" id="closedbg" name="closedbg" />Close basket group</label></li>
+                       [% ELSE %]
+                           <input type="hidden" id="closedbg" name="closedbg" value ="1"/>
+                       [% END %]
 						</ol>
 					</fieldset>
-
+                    [% UNLESS (closedbg) %]
 	                <fieldset class="action"><input type="hidden" name="booksellerid" value="[% booksellerid %]" />
 		                [% IF ( basketgroupid ) %]
 		                	<input type="hidden" name="basketgroupid" value="[% basketgroupid %]" />
@@ -233,6 +291,7 @@ function submitForm(form) {
 		                <input type="hidden" name="op" value="attachbasket" />
                         <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid %]" class="cancel">Cancel</a>
 	                </fieldset>
+                    [% END %]
 				</form>
 			</div> 
 		</div> 	 
@@ -245,9 +304,9 @@ function submitForm(form) {
 
 	<div id="basket_groups" class="toptabs">
 	<ul class="ui-tabs-nav">
-        [% UNLESS ( closed ) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
+        [% UNLESS ( listclosed) %]<li class="ui-tabs-selected"><a href="#opened">Open</a></li>
         [% ELSE%]<li><a href="#opened">Open</a></li>[% END %]
-        [% IF ( closed ) %]<li class="ui-tabs-selected"><a href="#closed">Closed</a></li>
+        [% IF ( listclosed) %]<li class="ui-tabs-selected"><a href="#closed">Closed</a></li>
         [% ELSE %]<li><a href="#closed">Closed</a></li>[% END %]
     </ul>
     <div id="opened">
@@ -273,11 +332,11 @@ function submitForm(form) {
 												[% END %]
 						</td>
                                     <td>[% basketgroup.id %]</td>
-                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
-                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
+                                    <td>[% Branches.GetName( basketgroup.billingplace ) %]</td>
+                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
                                     <td>[% basketgroup.basketsqty %]</td>
 							<td>
-								<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />
+                                                             <input type="button" onclick="closeandprint('[% basketgroup.id %]');" value="Close and print" />
 								<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Edit" /></form>
 								<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Delete" /></form>
 							</td>
@@ -311,10 +370,11 @@ function submitForm(form) {
 										[% END %]
 					</td>
                                     <td>[% basketgroup.id %]</td>
-                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
-                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
+                                    <td>[% Branches.GetName( basketgroup.billingplace ) %]</td>
+                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% Branches.GetName( basketgroup.deliveryplace ) %][% END %]</td>
                                     <td>[% basketgroup.basketsqty %]</td>
 					<td>
+                            <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="add" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="View" /></form>
 							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
 							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Print" /></form>
                                                         <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Export as CSV" /></form>