WebSVN – wpShopGermany4 – Diff – /mods/mod_abo/index.phtml



                        <?php echo wpsg_drawForm_TextEnd(__('Abo abgeschlossen am (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>       
                        
                        <?php echo wpsg_drawForm_TextStart(); ?>
                        <div class="row">
                            <div class="col-lg-6">
                                <select name="filter[enddate_m]" class="form-control input-sm">
                                    <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
                                    <?php for ($i = 1; $i <= 12; $i ++) { ?>
                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>
                                    <?php } ?>
                                </select>
                            </div>
                            <div class="col-lg-6">
                                <select name="filter[enddate_y]" class="form-control input-sm">
                                    <option value="-1"><?php echo __("Alle", "wpsg"); ?></option>
                                    <?php foreach ($this->view['enddate_years'] as $y) { ?>
                                    <option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>
                                    <?php } ?>
                                </select>
                            </div>
                        </div>
                        <?php echo wpsg_drawForm_TextEnd(__('Abo gekündigt am (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>                      

                    <tr>
                        <td class="col_checkbox">
 
                            <input class="col_set_checkbox" name="wpsg_multido[<?php echo $oOrder->id; ?>]" type="checkbox" />
 
                        </td>
                        <td class="col_nr">
 
                            <?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />
 
                            <div class="actions">
                                <span class="view"><a title="<?php echo __("Dieses Abonnement ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>
                                |
                                <?php if ($this->view['arFilter']['status'] != wpsg_ShopController::STATUS_GEKUENDIGTEABOS) { ?>
                                <span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement kündigen möchten?', 'wpsg'); ?>');" title="<?php echo __("Dieses Abonnement kündigen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=resign&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Kündigen", "wpsg"); ?></a></span>
                                |
                                <?php } ?>
                                <span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Dieses Abonnement löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&abo=1&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>
                            </div>
							
                            <?php if (trim($oOrder->admincomment) != "") { ?>
                            <a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"></a>
                            <?php } ?>
 
                            <?php if (trim($oOrder->comment) != "") { ?>
                            <a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign customercomment" href="#"></a>
                            <?php } ?>
														
                            <?php if ($oOrder->hasShippingAdress()) { ?>
                            <a title="<?php echo __("Lieferadresse beachten", "wpsg"); ?>" onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"></a>
                            <?php } ?>
 
                        </td>
                        <td class="col_customer">
                            <?php $firma = $oOrder->getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?>
                            <?php echo $firma; ?><br />
                            <?php } ?>
                            <?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getInvoiceFirstname(); ?> <?php echo $oOrder->getInvoiceName(); ?>
                            <br />
                            <span class="wpsg_grey"><?php echo $oOrder->getInvoiceStreet(); ?><br />
                            <?php echo ltrim($oOrder->getInvoiceZip().' '.$oOrder->getInvoiceCity()); ?> <?php echo $oOrder->getInvoiceCountryKuerzel(); ?>
                            </span>
                        </td>
                        <td class="col_payment">
 
                            <?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>
                            <?php if ($oOrder->getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?>
                                <?php echo wpsg_hspc($this->callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?>

 
                            <?php if ($oOrder->getPaymentAmount() > 0) { ?>
                            &nbsp;-&nbsp;<?php echo wpsg_ff($oOrder->getPaymentAmount(), $this->get_option('wpsg_currency')); ?>
                            <?php } ?>
 
                        </td>
                        <td class="col_shipping">
 
                            <?php echo $oOrder->getShippingLabel(); ?>
 
                            <?php if ($oOrder->getShippingAmount() > 0) { ?>

                                    <?php echo $oOrder->getShippingStreet(); ?>
                                    <?php echo $oOrder->getShippingZip(); ?> <?php echo $oOrder->getShippingCity(); ?> <?php echo $oOrder->getShippingCountryKuerzel(); ?><br />
                            </span>
                            <?php } ?>
 
                        </td>
                        <td class="col_products">
 
                            <?php $oOrderProducts = $oOrder->getOrderProducts(); ?>
                            
                            <?php foreach ($oOrderProducts as $oOrderProduct) { ?>

                        </td>
                        <td class="col_sum">
                            <?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>
                        </td>
                        
                        <?php /* Laufzeitspalte */ ?>
                        <td class="col_time">
                            <?php if (in_array(strval($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id))), array(1))) { ?>
 
                            	<?php $abo_expiration = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id, $oOrderProduct->getProductKey()))); ?>
 
 
 
                              <?php if ($abo_expiration > time()) { ?>
                              	
                              	<span class="wpsg_mod_abo_future_expire"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>
                              
                              <?php } else { ?>

                <?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>
            </div>
 
            <div class="wpsg_clear"></div>
 
 
		<?php } else { ?>
 
            <?php echo wpsg_drawForm_AdminboxStart(); ?>
    		<?php echo __('Keine Abonnements in der Datenbank.', 'wpsg'); ?>
            <?php echo wpsg_drawForm_AdminboxEnd(); ?>

Rev 6855	Rev 6867
Line 58...	Line 58...
58	`<?php echo wpsg_drawForm_TextEnd(__('Abo abgeschlossen am (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>`	58	`<?php echo wpsg_drawForm_TextEnd(__('Abo abgeschlossen am (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>`
59		59
60	`<?php echo wpsg_drawForm_TextStart(); ?>`	60	`<?php echo wpsg_drawForm_TextStart(); ?>`
61	`<div class="row">`	61	`<div class="row">`
62	`<div class="col-lg-6">`	62	`<div class="col-lg-6">`
63	`<select name="filter[cdate_m]" class="form-control input-sm">`	63	`<select name="filter[enddate_m]" class="form-control input-sm">`
64	`<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>`	64	`<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>`
65	`<?php for ($i = 1; $i <= 12; $i ++) { ?>`	65	`<?php for ($i = 1; $i <= 12; $i ++) { ?>`
66	`<option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>`	66	`<option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_m']) == $i)?'selected="selected"':''); ?> value="<?php echo str_pad($i, 2, '0', STR_PAD_LEFT); ?>"><?php echo strftime("%B", mktime(0, 0, 0, $i, 1, 2000)); ?></option>`
67	`<?php } ?>`	67	`<?php } ?>`
68	`</select>`	68	`</select>`
69	`</div>`	69	`</div>`
70	`<div class="col-lg-6">`	70	`<div class="col-lg-6">`
71	`<select name="filter[cdate_y]" class="form-control input-sm">`	71	`<select name="filter[enddate_y]" class="form-control input-sm">`
72	`<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>`	72	`<option value="-1"><?php echo __("Alle", "wpsg"); ?></option>`
73	`<?php foreach ($this->view['cdate_years'] as $y) { ?>`	73	`<?php foreach ($this->view['enddate_years'] as $y) { ?>`
74	`<option <?php echo ((wpsg_getStr($this->view['arFilter']['cdate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>`	74	`<option <?php echo ((wpsg_getStr($this->view['arFilter']['enddate_y']) == $y)?'selected="selected"':''); ?> value="<?php echo $y; ?>"><?php echo $y; ?></option>`
75	`<?php } ?>`	75	`<?php } ?>`
76	`</select>`	76	`</select>`
77	`</div>`	77	`</div>`
78	`</div>`	78	`</div>`
79	`<?php echo wpsg_drawForm_TextEnd(__('Abo gekündigt am (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>`	79	`<?php echo wpsg_drawForm_TextEnd(__('Abo gekündigt am (Monat/Jahr)', 'wpsg'), array('noP' => true)); ?>`
Line 128...	Line 128...
128	`<tr>`	128	`<tr>`
129	`<td class="col_checkbox">`	129	`<td class="col_checkbox">`
130		130
131	`<input class="col_set_checkbox" name="wpsg_multido[<?php echo $oOrder->id; ?>]" type="checkbox" />`	131	`<input class="col_set_checkbox" name="wpsg_multido[<?php echo $oOrder->id; ?>]" type="checkbox" />`
132		132
133	`</td>`	133	`</td>`
134	`<td class="col_nr">`	134	`<td class="col_nr">`
135		135
136	`<?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />`	136	`<?php echo $oOrder->getNr(); ?> <span class="wpsg_grey"><?php echo wpsg_formatTimestamp(strtotime($oOrder->cdate), false); ?></span><br />`
137		137
138	`<div class="actions">`	138	`<div class="actions">`
139	`<span class="view"><a title="<?php echo __("Diese Abonnement ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>`	139	`<span class="view"><a title="<?php echo __("Dieses Abonnement ansehen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=view&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Ansehen", "wpsg"); ?></a></span>`
140	`\|`	140	`\|`
-		141	`<?php if ($this->view['arFilter']['status'] != wpsg_ShopController::STATUS_GEKUENDIGTEABOS) { ?>`
141	`<span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie diese Abonnement kündigen möchten?', 'wpsg'); ?>');" title="<?php echo __("Diese Abonnement stornieren", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=storno&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Kündigen", "wpsg"); ?></a></span>`	142	`<span class="storno"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement kündigen möchten?', 'wpsg'); ?>');" title="<?php echo __("Dieses Abonnement kündigen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=resign&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __("Kündigen", "wpsg"); ?></a></span>`
142	`\|`	143	`\|`
-		144	`<?php } ?>`
143	`<span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Diese Abonnement löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>`	145	`<span class="delete"><a onclick="return confirm('<?php echo __('Sind Sie sich sicher, dass Sie dieses Abonnement löschen möchten?', 'wpsg'); ?>');" title="<?php echo __('Dieses Abonnement löschen', 'wpsg'); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&action=delete&abo=1&noheader=1&edit_id=<?php echo $oOrder->id; ?>"><?php echo __('Löschen', 'wpsg'); ?></a></span>`
144	`</div>`	146	`</div>`
145		147
146	`<?php if (trim($oOrder->admincomment) != "") { ?>`	148	`<?php if (trim($oOrder->admincomment) != "") { ?>`
147	`<a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"></a>`	149	`<a title="<?php echo __("Kommentar (Admin): ", "wpsg").htmlspecialchars($oOrder->admincomment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign admincomment" href="#"></a>`
148	`<?php } ?>`	150	`<?php } ?>`
149		151
150	`<?php if (trim($oOrder->comment) != "") { ?>`	152	`<?php if (trim($oOrder->comment) != "") { ?>`
151	`<a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign customercomment" href="#"></a>`	153	`<a title="<?php echo __("Kommentar (Kunde): ", "wpsg").htmlspecialchars($oOrder->comment); ?>" onclick="return false;" class="glyphicon glyphicon-question-sign customercomment" href="#"></a>`
152	`<?php } ?>`	154	`<?php } ?>`
153		155
154	`<?php if ($oOrder->hasShippingAdress()) { ?>`	156	`<?php if ($oOrder->hasShippingAdress()) { ?>`
155	`<a title="<?php echo __("Lieferadresse beachten", "wpsg"); ?>" onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"></a>`	157	`<a title="<?php echo __("Lieferadresse beachten", "wpsg"); ?>" onclick="return false;" class="glyphicon glyphicon-map-marker shippingadress" href="#"></a>`
156	`<?php } ?>`	158	`<?php } ?>`
157		159
158	`</td>`	160	`</td>`
159	`<td class="col_customer">`	161	`<td class="col_customer">`
160	`<?php $firma = $oOrder->getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?>`	162	`<?php $firma = $oOrder->getInvoiceCompany(); if (wpsg_isSizedString($firma)) { ?>`
161	`<?php echo $firma; ?><br />`	163	`<?php echo $firma; ?><br />`
162	`<?php } ?>`	164	`<?php } ?>`
163	`<?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getInvoiceFirstname(); ?> <?php echo $oOrder->getInvoiceName(); ?>`	165	`<?php echo $oOrder->getInvoiceTitle(); ?> <?php echo $oOrder->getInvoiceFirstname(); ?> <?php echo $oOrder->getInvoiceName(); ?>`
164	`<br />`	166	`<br />`
165	`<span class="wpsg_grey"><?php echo $oOrder->getInvoiceStreet(); ?><br />`	167	`<span class="wpsg_grey"><?php echo $oOrder->getInvoiceStreet(); ?><br />`
166	`<?php echo ltrim($oOrder->getInvoiceZip().' '.$oOrder->getInvoiceCity()); ?> <?php echo $oOrder->getInvoiceCountryKuerzel(); ?>`	168	`<?php echo ltrim($oOrder->getInvoiceZip().' '.$oOrder->getInvoiceCity()); ?> <?php echo $oOrder->getInvoiceCountryKuerzel(); ?>`
167	`</span>`	169	`</span>`
168	`</td>`	170	`</td>`
169	`<td class="col_payment">`	171	`<td class="col_payment">`
170		172
171	`<?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>`	173	`<?php /* Bei Crefopay wird die Darstellung der Zahlungsart über das Modul geregelt */ ?>`
172	`<?php if ($oOrder->getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?>`	174	`<?php if ($oOrder->getPaymentID() == 4000 && $this->hasMod('wpsg_mod_crefopay')) { ?>`
173	`<?php echo wpsg_hspc($this->callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?>`	175	`<?php echo wpsg_hspc($this->callMod('wpsg_mod_crefopay', 'getOrderPaymentName', array($oOrder->id))); ?>`
Line 177...	Line 179...
177		179
178	`<?php if ($oOrder->getPaymentAmount() > 0) { ?>`	180	`<?php if ($oOrder->getPaymentAmount() > 0) { ?>`
179	` - <?php echo wpsg_ff($oOrder->getPaymentAmount(), $this->get_option('wpsg_currency')); ?>`	181	` - <?php echo wpsg_ff($oOrder->getPaymentAmount(), $this->get_option('wpsg_currency')); ?>`
180	`<?php } ?>`	182	`<?php } ?>`
181		183
182	`</td>`	184	`</td>`
183	`<td class="col_shipping">`	185	`<td class="col_shipping">`
184		186
185	`<?php echo $oOrder->getShippingLabel(); ?>`	187	`<?php echo $oOrder->getShippingLabel(); ?>`
186		188
187	`<?php if ($oOrder->getShippingAmount() > 0) { ?>`	189	`<?php if ($oOrder->getShippingAmount() > 0) { ?>`
Line 195...	Line 197...
195	`<?php echo $oOrder->getShippingStreet(); ?>`	197	`<?php echo $oOrder->getShippingStreet(); ?>`
196	`<?php echo $oOrder->getShippingZip(); ?> <?php echo $oOrder->getShippingCity(); ?> <?php echo $oOrder->getShippingCountryKuerzel(); ?><br />`	198	`<?php echo $oOrder->getShippingZip(); ?> <?php echo $oOrder->getShippingCity(); ?> <?php echo $oOrder->getShippingCountryKuerzel(); ?><br />`
197	`</span>`	199	`</span>`
198	`<?php } ?>`	200	`<?php } ?>`
199		201
200	`</td>`	202	`</td>`
201	`<td class="col_products">`	203	`<td class="col_products">`
202		204
203	`<?php $oOrderProducts = $oOrder->getOrderProducts(); ?>`	205	`<?php $oOrderProducts = $oOrder->getOrderProducts(); ?>`
204		206
205	`<?php foreach ($oOrderProducts as $oOrderProduct) { ?>`	207	`<?php foreach ($oOrderProducts as $oOrderProduct) { ?>`
Line 216...	Line 218...
216	`</td>`	218	`</td>`
217	`<td class="col_sum">`	219	`<td class="col_sum">`
218	`<?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>`	220	`<?php echo wpsg_ff($oOrder->getAmount(), $this->get_option('wpsg_currency')); ?>`
219	`</td>`	221	`</td>`
220		222
221	`/* Laufzeitspalte */`	223	`<?php /* Laufzeitspalte */ ?>`
222	`<td class="col_time">`	224	`<td class="col_time">`
223	`<?php if (in_array(strval($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id))), array(1))) { ?>`	225	`<?php if (in_array(strval($this->callMod('wpsg_mod_abo', 'isAboOrder', array($oOrder->id))), array(1))) { ?>`
224		226
225	`<?php $abo_expiration = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id, $oOrderProduct->getProductKey()))); ?>`	227	`<?php $abo_expiration = strtotime($this->callMod('wpsg_mod_abo', 'getOrderAboExpiration', array($oOrder->id, $oOrderProduct->getProductKey()))); ?>`
226		228
227	`<?php echo __('Abo Laufzeit:', 'wpsg'); ?>`	-
228		-
229	`<?php if ($abo_expiration > time()) { ?>`	229	`<?php if ($abo_expiration > time()) { ?>`
230		230
231	`<span class="wpsg_mod_abo_future_expire"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>`	231	`<span class="wpsg_mod_abo_future_expire"><?php echo wpsg_formatTimestamp($abo_expiration); ?></span>`
232		232
233	`<?php } else { ?>`	233	`<?php } else { ?>`
Line 264...	Line 264...
264	`<?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>`	264	`<?php $this->render(WPSG_PATH_VIEW.'/admin/pager.phtml'); ?>`
265	`</div>`	265	`</div>`
266		266
267	`<div class="wpsg_clear"></div>`	267	`<div class="wpsg_clear"></div>`
268		268
269		-
270	`<?php } else { ?>`	269	`<?php } else { ?>`
271		270
272	`<?php echo wpsg_drawForm_AdminboxStart(); ?>`	271	`<?php echo wpsg_drawForm_AdminboxStart(); ?>`
273	`<?php echo __('Keine Abonnements in der Datenbank.', 'wpsg'); ?>`	272	`<?php echo __('Keine Abonnements in der Datenbank.', 'wpsg'); ?>`
274	`<?php echo wpsg_drawForm_AdminboxEnd(); ?>`	273	`<?php echo wpsg_drawForm_AdminboxEnd(); ?>`

Subversion Repositories wpShopGermany4

(root)/mods/mod_abo/index.phtml – Rev 6855 → 6867