Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove $can_be_edited in favour of ->is_editable() 

For #6154
This commit is contained in:
Mike Jolley 2014-09-03 10:09:04 +01:00
parent cb76bd7fb8
commit 265ffee23a
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/admin/meta-boxes/views/html-order-fee.php
View File

@ -49,7 +49,7 @@ if ( ! defined( 'ABSPATH' ) ) {
foreach ( $order_taxes as $tax_item ) :
$tax_item_id = $tax_item['rate_id'];
$tax_item_total = isset( $tax_data['total'][ $tax_item_id ] ) ? $tax_data['total'][ $tax_item_id ] : '';
?>
<td class="line_tax" width="1%">
@ -76,7 +76,7 @@ if ( ! defined( 'ABSPATH' ) ) {
?>
<td class="wc-order-edit-line-item">
<?php if ( $can_be_edited ) : ?>
<?php if ( $order->is_editable() ) : ?>
<div class="wc-order-edit-line-item-actions">
<a class="edit-order-item" href="#"></a><a class="delete-order-item" href="#"></a>
</div>

2
includes/admin/meta-boxes/views/html-order-item.php
View File

@ -245,7 +245,7 @@ if ( ! defined( 'ABSPATH' ) ) {
?>
<td class="wc-order-edit-line-item">
<?php if ( $can_be_edited ) : ?>
<?php if ( $order->is_editable() ) : ?>
<div class="wc-order-edit-line-item-actions">
<a class="edit-order-item" href="#"></a><a class="delete-order-item" href="#"></a>
</div>

15
includes/admin/meta-boxes/views/html-order-items.php
View File

@ -13,9 +13,6 @@ $line_items = $order->get_items( apply_filters( 'woocommerce_admin_orde
$line_items_fee = $order->get_items( 'fee' );
$line_items_shipping = $order->get_items( 'shipping' );
// Check if order can be edited
$can_be_edited = $order->is_editable();
if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
$order_taxes = $order->get_taxes();
$tax_classes = array_filter( array_map( 'trim', explode( "\n", get_option( 'woocommerce_tax_classes' ) ) ) );
@ -167,7 +164,7 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<div class="clear"></div>
</div>
</td>
<td><?php if ( $can_be_edited ) : ?><div class="wc-order-edit-line-item-actions"><a class="edit-order-item" href="#"></a></div><?php endif; ?></td>
<td><?php if ( $order->is_editable() ) : ?><div class="wc-order-edit-line-item-actions"><a class="edit-order-item" href="#"></a></div><?php endif; ?></td>
</tr>
<?php do_action( 'woocommerce_admin_order_totals_after_discount', $order->id ); ?>
@ -181,7 +178,7 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<div class="clear"></div>
</div>
</td>
<td><?php if ( $can_be_edited ) : ?><div class="wc-order-edit-line-item-actions"><a class="edit-order-item" href="#"></a></div><?php endif; ?></td>
<td><?php if ( $order->is_editable() ) : ?><div class="wc-order-edit-line-item-actions"><a class="edit-order-item" href="#"></a></div><?php endif; ?></td>
</tr>
<?php do_action( 'woocommerce_admin_order_totals_after_total', $order->id ); ?>
@ -201,7 +198,7 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<p class="bulk-actions">
<select>
<option value=""><?php _e( 'Actions', 'woocommerce' ); ?></option>
<?php if ( $can_be_edited ) : ?>
<?php if ( $order->is_editable() ) : ?>
<optgroup label="<?php _e( 'Edit', 'woocommerce' ); ?>">
<option value="delete"><?php _e( 'Delete selected line item(s)', 'woocommerce' ); ?></option>
</optgroup>
@ -215,16 +212,16 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
<button type="button" class="button do_bulk_action wc-reload" title="<?php _e( 'Apply', 'woocommerce' ); ?>"><span><?php _e( 'Apply', 'woocommerce' ); ?></span></button>
</p>
<p class="add-items">
<?php if ( $can_be_edited ) : ?>
<?php if ( $order->is_editable() ) : ?>
<button type="button" class="button add-line-item"><?php _e( 'Add line item(s)', 'woocommerce' ); ?></button>
<?php endif; ?>
<?php if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) && $can_be_edited ) : ?>
<?php if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) && $order->is_editable() ) : ?>
<button type="button" class="button add-order-tax"><?php _e( 'Add Tax', 'woocommerce' ); ?></button>
<?php endif; ?>
<?php if ( ( $order->get_total() - $order->get_total_refunded() ) > 0 ) : ?>
<button type="button" class="button refund-items"><?php _e( 'Refund', 'woocommerce' ); ?></button>
<?php endif; ?>
<?php if ( $can_be_edited ) : ?>
<?php if ( $order->is_editable() ) : ?>
<button type="button" class="button button-primary calculate-tax-action"><?php _e( 'Calculate Taxes', 'woocommerce' ); ?></button>
<button type="button" class="button button-primary calculate-action"><?php _e( 'Calculate Total', 'woocommerce' ); ?></button>
<?php endif; ?>

2
includes/admin/meta-boxes/views/html-order-shipping.php
View File

@ -101,7 +101,7 @@ if ( ! defined( 'ABSPATH' ) ) {
?>
<td class="wc-order-edit-line-item">
<?php if ( $can_be_edited ) : ?>
<?php if ( $order->is_editable() ) : ?>
<div class="wc-order-edit-line-item-actions">
<a class="edit-order-item" href="#"></a><a class="delete-order-item" href="#"></a>
</div>

3
includes/class-wc-ajax.php
View File

@ -1005,7 +1005,6 @@ class WC_AJAX {
}
$item = apply_filters( 'woocommerce_ajax_order_item', $item, $item_id );
$can_be_edited = $order->is_editable();
include( 'admin/meta-boxes/views/html-order-item.php' );
@ -1023,7 +1022,6 @@ class WC_AJAX {
$order_id = absint( $_POST['order_id'] );
$order = wc_get_order( $order_id );
$order_taxes = $order->get_taxes();
$can_be_edited = $order->is_editable();
$item = array();
// Add new fee
@ -1053,7 +1051,6 @@ class WC_AJAX {
$order = wc_get_order( $order_id );
$order_taxes = $order->get_taxes();
$shipping_methods = WC()->shipping() ? WC()->shipping->load_shipping_methods() : array();
$can_be_edited = $order->is_editable();
$item = array();
// Add new shipping