テキスト比較

2 つのテキスト ファイルの違いを見つける

ライブエディター
未変更行を折りたたむ
折り返しなし
レイアウト
比較精度
シンタックスハイライト

IP159AlteredQuotePDFWorkingCabji

作成日 差分は期限切れになりません
9 削除
242 行
30 追加
249 行
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="<?php _trans('cldr'); ?>">
<html lang="<?php _trans('cldr'); ?>">
<head>
<head>
<meta charset="utf-8">
<meta charset="utf-8">
<title><?php _trans('quote'); ?></title>
<title><?php _trans('quote'); ?></title>
<link rel="stylesheet"
<link rel="stylesheet"
href="<?php echo base_url(); ?>assets/<?php echo get_setting('system_theme', 'invoiceplane'); ?>/css/templates.css">
href="<?php echo base_url(); ?>assets/<?php echo get_setting('system_theme', 'invoiceplane'); ?>/css/templates.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/core/css/custom-pdf.css">
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/core/css/custom-pdf.css">
</head>
</head>
<body>
<body>
<header class="clearfix">
<header class="clearfix">


<div id="logo">
<div id="logo">
<?php echo invoice_logo_pdf(); ?>
<?php echo invoice_logo_pdf(); ?>
</div>
</div>


<!-- note: moved quote number to top of PDF -->
<h1 class="invoice-title"><?php echo trans('quote') . ' ' . $quote->quote_number; ?></h1>

<div id="client">
<div id="client">
<div>
<div>
<b><?php _htmlsc($quote->client_name); ?></b>
<b><?php _htmlsc($quote->client_name); ?></b>
</div>
</div>
<?php if ($quote->client_vat_id) {
<?php if ($quote->client_vat_id) {
echo '<div>' . trans('vat_id_short') . ': ' . $quote->client_vat_id . '</div>';
echo '<div>' . trans('vat_id_short') . ': ' . $quote->client_vat_id . '</div>';
}
}
if ($quote->client_tax_code) {
if ($quote->client_tax_code) {
echo '<div>' . trans('tax_code_short') . ': ' . $quote->client_tax_code . '</div>';
echo '<div>' . trans('tax_code_short') . ': ' . $quote->client_tax_code . '</div>';
}
}
if ($quote->client_address_1) {
if ($quote->client_address_1) {
echo '<div>' . htmlsc($quote->client_address_1) . '</div>';
echo '<div>' . htmlsc($quote->client_address_1) . '</div>';
}
}
if ($quote->client_address_2) {
if ($quote->client_address_2) {
echo '<div>' . htmlsc($quote->client_address_2) . '</div>';
echo '<div>' . htmlsc($quote->client_address_2) . '</div>';
}
}
if ($quote->client_city || $quote->client_state || $quote->client_zip) {
if ($quote->client_city || $quote->client_state || $quote->client_zip) {
echo '<div>';
echo '<div>';
if ($quote->client_city) {
if ($quote->client_city) {
echo htmlsc($quote->client_city) . ' ';
echo htmlsc($quote->client_city) . ' ';
}
}
if ($quote->client_state) {
if ($quote->client_state) {
echo htmlsc($quote->client_state) . ' ';
echo htmlsc($quote->client_state) . ' ';
}
}
if ($quote->client_zip) {
if ($quote->client_zip) {
echo htmlsc($quote->client_zip);
echo htmlsc($quote->client_zip);
}
}
echo '</div>';
echo '</div>';
}
}
if ($quote->client_state) {
if ($quote->client_state) {
echo '<div>' . htmlsc($quote->client_state) . '</div>';
echo '<div>' . htmlsc($quote->client_state) . '</div>';
}
}
if ($quote->client_country) {
if ($quote->client_country) {
echo '<div>' . get_country_name(trans('cldr'), $quote->client_country) . '</div>';
echo '<div>' . get_country_name(trans('cldr'), $quote->client_country) . '</div>';
}
}


echo '<br/>';
echo '<br/>';


if ($quote->client_phone) {
if ($quote->client_phone) {
echo '<div>' . trans('phone_abbr') . ': ' . htmlsc($quote->client_phone) . '</div>';
echo '<div>' . trans('phone_abbr') . ': ' . htmlsc($quote->client_phone) . '</div>';
} ?>
} ?>


</div>
</div>
<div id="company">
<div id="company">
<div><b><?php _htmlsc($quote->user_name); ?></b></div>
<div><b><?php _htmlsc($quote->user_name); ?></b></div>
<?php if ($quote->user_vat_id) {
<?php if ($quote->user_vat_id) {
echo '<div>' . trans('vat_id_short') . ': ' . $quote->user_vat_id . '</div>';
echo '<div>' . trans('vat_id_short') . ': ' . $quote->user_vat_id . '</div>';
}
}
if ($quote->user_tax_code) {
if ($quote->user_tax_code) {
echo '<div>' . trans('tax_code_short') . ': ' . $quote->user_tax_code . '</div>';
echo '<div>' . trans('tax_code_short') . ': ' . $quote->user_tax_code . '</div>';
}
}
if ($quote->user_address_1) {
if ($quote->user_address_1) {
echo '<div>' . htmlsc($quote->user_address_1) . '</div>';
echo '<div>' . htmlsc($quote->user_address_1) . '</div>';
}
}
if ($quote->user_address_2) {
if ($quote->user_address_2) {
echo '<div>' . htmlsc($quote->user_address_2) . '</div>';
echo '<div>' . htmlsc($quote->user_address_2) . '</div>';
}
}
if ($quote->user_city || $quote->user_state || $quote->user_zip) {
if ($quote->user_city || $quote->user_state || $quote->user_zip) {
echo '<div>';
echo '<div>';
if ($quote->user_city) {
if ($quote->user_city) {
echo htmlsc($quote->user_city) . ' ';
echo htmlsc($quote->user_city) . ' ';
}
}
if ($quote->user_state) {
if ($quote->user_state) {
echo htmlsc($quote->user_state) . ' ';
echo htmlsc($quote->user_state) . ' ';
}
}
if ($quote->user_zip) {
if ($quote->user_zip) {
echo htmlsc($quote->user_zip);
echo htmlsc($quote->user_zip);
}
}
echo '</div>';
echo '</div>';
}
}
if ($quote->user_country) {
if ($quote->user_country) {
echo '<div>' . get_country_name(trans('cldr'), $quote->user_country) . '</div>';
echo '<div>' . get_country_name(trans('cldr'), $quote->user_country) . '</div>';
}
}


echo '<br/>';
echo '<br/>';


if ($quote->user_phone) {
if ($quote->user_phone) {
echo '<div>' . trans('phone_abbr') . ': ' . htmlsc($quote->user_phone) . '</div>';
echo '<div>' . trans('phone_abbr') . ': ' . htmlsc($quote->user_phone) . '</div>';
}
}
if ($quote->user_fax) {
if ($quote->user_fax) {
echo '<div>' . trans('fax_abbr') . ': ' . htmlsc($quote->user_fax) . '</div>';
echo '<div>' . trans('fax_abbr') . ': ' . htmlsc($quote->user_fax) . '</div>';
}
}
?>
?>
</div>
</div>


</header>
</header>


<main>
<main>


<div class="invoice-details clearfix">
<div class="invoice-details clearfix">
<table>
<table>
<tr>
<tr>
<td><?php echo trans('quote_date') . ':'; ?></td>
<td><?php echo trans('quote_date') . ':'; ?></td>
<td><?php echo date_from_mysql($quote->quote_date_created, true); ?></td>
<td><?php echo date_from_mysql($quote->quote_date_created, true); ?></td>
</tr>
</tr>
<tr>
<tr>
<td><?php echo trans('expires') . ': '; ?></td>
<td><?php echo trans('expires') . ': '; ?></td>
<td><?php echo date_from_mysql($quote->quote_date_expires, true); ?></td>
<td><?php echo date_from_mysql($quote->quote_date_expires, true); ?></td>
</tr>
</tr>
<tr>
<tr>
<td><?php echo trans('total') . ': '; ?></td>
<td><?php echo trans('total') . ': '; ?></td>
<td><?php echo format_currency($quote->quote_total); ?></td>
<td><?php echo format_currency($quote->quote_total); ?></td>
</tr>
</tr>
</table>
</table>
</div>
</div>


<h1 class="invoice-title"><?php echo trans('quote') . ' ' . $quote->quote_number; ?></h1>
<!-- note: moved job notes to above the itemized list table -->
Text moved with changes from lines 232-237 (98.7% similarity)

<?php if ($quote->notes) : ?>
<div class="notes">
<b><?php _trans('notes'); ?></b><br/>
<?php echo nl2br(htmlsc($quote->notes)); ?>
</div>
<?php endif; ?>
<table class="item-table">
<table class="item-table">
<thead>
<thead>
<tr>
<tr>
<!-- note: the titles are commented out below so they don't show in the quote -->
<th class="item-name"><?php _trans('item'); ?></th>
<th class="item-name"><?php _trans('item'); ?></th>
<th class="item-desc"><?php _trans('description'); ?></th>
<th class="item-desc"><?php _trans('description'); ?></th>
<th class="item-amount text-right"><?php _trans('qty'); ?></th>
<th class="item-amount text-right"><?php _trans('qty'); ?></th>
<th class="item-price text-right"><?php _trans('price'); ?></th>
<th class="item-price text-right"><!-- <?php _trans('price'); ?> --></th>
<?php if ($show_item_discounts) : ?>
<?php if ($show_item_discounts) : ?>
<th class="item-discount text-right"><?php _trans('discount'); ?></th>
<th class="item-discount text-right"><!-- <?php _trans('discount'); ?> --></th>
<?php endif; ?>
<?php endif; ?>
<th class="item-total text-right"><?php _trans('total'); ?></th>
<th class="item-total text-right"><!-- <?php _trans('total'); ?> -->Totals</th>
</tr>
</tr>
</thead>
</thead>
<tbody>
<tbody>


<?php
<?php
foreach ($items as $item) { ?>
foreach ($items as $item) { ?>
<tr>
<tr>
<!-- note: the values are commented out below so they don't show in the quote -->
<td><?php _htmlsc($item->item_name); ?></td>
<td><?php _htmlsc($item->item_name); ?></td>
<td><?php echo nl2br(htmlsc($item->item_description)); ?></td>
<td><?php echo nl2br(htmlsc($item->item_description)); ?></td>
<td class="text-right">
<td class="text-right">
<?php echo format_amount($item->item_quantity); ?>
<?php echo format_amount($item->item_quantity); ?>
<?php if ($item->item_product_unit) : ?>
<?php if ($item->item_product_unit) : ?>
<br>
<br>
<small><?php _htmlsc($item->item_product_unit); ?></small>
<small><?php _htmlsc($item->item_product_unit); ?></small>
<?php endif; ?>
<?php endif; ?>
</td>
</td>
<td class="text-right">
<td class="text-right">
<?php echo format_currency($item->item_price); ?>
<!-- <?php echo format_currency($item->item_price); ?> -->
</td>
</td>
<?php if ($show_item_discounts) : ?>
<?php if ($show_item_discounts) : ?>
<td class="text-right">
<td class="text-right">
<?php echo format_currency($item->item_discount); ?>
<!-- <?php echo format_currency($item->item_discount); ?> -->
</td>
</td>
<?php endif; ?>
<?php endif; ?>
<td class="text-right">
<td class="text-right">
<?php echo format_currency($item->item_total); ?>
<!-- <?php echo format_currency($item->item_total); ?> -->
</td>
</td>
</tr>
</tr>
<?php } ?>
<?php } ?>


</tbody>
</tbody>
<tbody class="invoice-sums">
<tbody class="invoice-sums">


<tr>
<tr>
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?>
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?>
class="text-right"><?php _trans('subtotal'); ?></td>
class="text-right"><?php _trans('subtotal'); ?></td>
<td class="text-right"><?php echo format_currency($quote->quote_item_subtotal); ?></td>
<td class="text-right"><?php echo format_currency($quote->quote_item_subtotal); ?></td>
</tr>
</tr>


<?php if ($quote->quote_item_tax_total > 0) { ?>
<?php if ($quote->quote_item_tax_total > 0) { ?>
<tr>
<tr>
<!-- note: item_tax is commented out below and replaced by static string "GST" -->
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<?php _trans('item_tax'); ?>
<!-- <?php _trans('item_tax'); ?> --> GST
</td>
</td>
<td class="text-right">
<td class="text-right">
<?php echo format_currency($quote->quote_item_tax_total); ?>
<?php echo format_currency($quote->quote_item_tax_total); ?>
</td>
</td>
</tr>
</tr>
<?php } ?>
<?php } ?>


<?php foreach ($quote_tax_rates as $quote_tax_rate) : ?>
<?php foreach ($quote_tax_rates as $quote_tax_rate) : ?>
<tr>
<tr>
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<?php echo $quote_tax_rate->quote_tax_rate_name . ' (' . format_amount($quote_tax_rate->quote_tax_rate_percent) . '%)'; ?>
<?php echo $quote_tax_rate->quote_tax_rate_name . ' (' . format_amount($quote_tax_rate->quote_tax_rate_percent) . '%)'; ?>
</td>
</td>
<td class="text-right">
<td class="text-right">
<?php echo format_currency($quote_tax_rate->quote_tax_rate_amount); ?>
<?php echo format_currency($quote_tax_rate->quote_tax_rate_amount); ?>
</td>
</td>
</tr>
</tr>
<?php endforeach ?>
<?php endforeach ?>


<?php if ($quote->quote_discount_percent != '0.00') : ?>
<?php if ($quote->quote_discount_percent != '0.00') : ?>
<tr>
<tr>
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<?php _trans('discount'); ?>
<?php _trans('discount'); ?>
</td>
</td>
<td class="text-right">
<td class="text-right">
<?php echo format_amount($quote->quote_discount_percent); ?>%
<?php echo format_amount($quote->quote_discount_percent); ?>%
</td>
</td>
</tr>
</tr>
<?php endif; ?>
<?php endif; ?>
<?php if ($quote->quote_discount_amount != '0.00') : ?>
<?php if ($quote->quote_discount_amount != '0.00') : ?>
<tr>
<tr>
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<?php _trans('discount'); ?>
<?php _trans('discount'); ?>
</td>
</td>
<td class="text-right">
<td class="text-right">
<?php echo format_currency($quote->quote_discount_amount); ?>
<?php echo format_currency($quote->quote_discount_amount); ?>
</td>
</td>
</tr>
</tr>
<?php endif; ?>
<?php endif; ?>


<tr>
<tr>
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<td <?php echo($show_item_discounts ? 'colspan="5"' : 'colspan="4"'); ?> class="text-right">
<b><?php _trans('total'); ?></b>
<b><?php _trans('total'); ?></b>
</td>
</td>
<td class="text-right">
<td class="text-right">
<b><?php echo format_currency($quote->quote_total); ?></b>
<b><?php echo format_currency($quote->quote_total); ?></b>
</td>
</td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>


</main>
</main>


<footer>
<footer>
Text moved with changes to lines 127-132 (98.7% similarity)
<?php if ($quote->notes) : ?>
<!-- note: removed note from footer -->
<div class="notes">
<b><?php _trans('notes'); ?></b><br/>
<?php echo nl2br(htmlsc($quote->notes)); ?>
</div>
<?php endif; ?>
</footer>
</footer>


</body>
</body>
</html>
</html>


保存された差分