Skip to content

Commit

Permalink
fixed incorrect classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielkerr
danielkerr committed Jun 30, 2024
1 parent 29f46c6 commit 480f9a0
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 29 deletions.
4 changes: 2 additions & 2 deletions upload/admin/controller/catalog/review.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,9 @@ public function form(): void {
}

if (!empty($review_info)) {
$data['date_added'] = ($review_info['date_added'] != '0000-00-00' ? date('Y-m-d', strtotime($review_info['date_added'])) : date('Y-m-d'));
$data['date_added'] = ($review_info['date_added'] != '0000-00-00 00:00:00' ? $review_info['date_added'] : date('Y-m-d H:i:s'));
} else {
$data['date_added'] = date('Y-m-d');
$data['date_added'] = date('Y-m-d H:i:s');
}

if (!empty($review_info)) {
Expand Down
3 changes: 1 addition & 2 deletions upload/admin/language/en-gb/marketing/coupon.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
$_['entry_total'] = 'Total Amount';
$_['entry_category'] = 'Category';
$_['entry_product'] = 'Products';
$_['entry_date_start'] = 'Date Start';
$_['entry_date_end'] = 'Date End';
$_['entry_date'] = 'Dates';
$_['entry_uses_total'] = 'Uses Per Coupon';
$_['entry_uses_customer'] = 'Uses Per Customer';
$_['entry_status'] = 'Status';
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/catalog/review_form.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<div class="row mb-3">
<label for="input-date-added" class="col-sm-2 col-form-label">{{ entry_date_added }}</label>
<div class="col-sm-10 col-md-4">
<input type="date" name="date_added" value="{{ date_added }}" placeholder="{{ entry_date_added }}" id="input-date-added" class="form-control"/>
<input type="datetime-local" name="date_added" value="{{ date_added }}" placeholder="{{ entry_date_added }}" id="input-date-added" class="form-control"/>
</div>
</div>
<div class="row mb-3">
Expand Down
5 changes: 3 additions & 2 deletions upload/admin/view/template/localisation/country_form.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_postcode_required }}</label>
<div class="col-sm-10">
<div class="btn-group">
<input type="radio" name="postcode_required" value="1" id="input-postcode-required-yes" class="btn-check"{% if postcode_required %} checked{% endif %}/> <label for="input-postcode-required-yes" class="btn btn-outline-secondary">{{ text_yes }}</label> <input type="radio" name="postcode_required" value="0" id="input-postcode-required-no" class="btn-check"{% if not postcode_required %} checked{% endif %}/> <label for="input-postcode-required-no" class="btn btn-outline-secondary">{{ text_no }}</label>
<div class="form-check form-switch form-switch-lg">
<input type="hidden" name="postcode_required" value="0"/>
<input type="checkbox" name="postcode_required" value="1" id="input-status" class="form-check-input"{% if postcode_required %} checked{% endif %}/>
</div>
</div>
</div>
Expand Down
25 changes: 10 additions & 15 deletions upload/admin/view/template/marketing/coupon_form.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@
<label class="col-sm-2 col-form-label">{{ entry_logged }}</label>
<div class="col-sm-10">
<div class="form-check form-switch form-switch-lg">
<input type="hidden" name="logged" value="0"/>
<input type="checkbox" name="logged" value="1" id="input-logged" class="form-check-input"{% if logged %} checked{% endif %}/>
<input type="hidden" name="logged" value="0"/> <input type="checkbox" name="logged" value="1" id="input-logged" class="form-check-input"{% if logged %} checked{% endif %}/>
</div>
<div class="form-text">{{ help_logged }}</div>
</div>
Expand All @@ -87,8 +86,7 @@
<label class="col-sm-2 col-form-label">{{ entry_shipping }}</label>
<div class="col-sm-10">
<div class="form-check form-switch form-switch-lg">
<input type="hidden" name="shipping" value="0"/>
<input type="checkbox" name="shipping" value="1" id="input-shipping" class="form-check-input"{% if shipping %} checked{% endif %}/>
<input type="hidden" name="shipping" value="0"/> <input type="checkbox" name="shipping" value="1" id="input-shipping" class="form-check-input"{% if shipping %} checked{% endif %}/>
</div>
</div>
</div>
Expand Down Expand Up @@ -133,15 +131,13 @@
</div>
</div>
<div class="row mb-3">
<label for="input-date-start" class="col-sm-2 col-form-label">{{ entry_date_start }}</label>
<div class="col-sm-10 col-md-4">
<input type="date" name="date_start" value="{{ date_start }}" placeholder="{{ entry_date_start }}" id="input-date-start" class="form-control"/>
</div>
</div>
<div class="row mb-3">
<label for="input-date-end" class="col-sm-2 col-form-label">{{ entry_date_end }}</label>
<div class="col-sm-10 col-md-4">
<input type="date" name="date_end" value="{{ date_end }}" placeholder="{{ entry_date_end }}" id="input-date-end" class="form-control"/>
<label class="col-sm-2 col-form-label">{{ entry_date }}</label>
<div class="col-sm-10">
<div class="input-group">
<input type="date" name="date_start" value="{{ date_start }}" id="input-date-start" class="form-control"/>
<div class="input-group-text"> - </div>
<input type="date" name="date_end" value="{{ date_end }}" id="input-date-end" class="form-control"/>
</div>
</div>
</div>
<div class="row mb-3">
Expand All @@ -162,8 +158,7 @@
<label class="col-sm-2 col-form-label">{{ entry_status }}</label>
<div class="col-sm-10">
<div class="form-check form-switch form-switch-lg">
<input type="hidden" name="status" value="0"/>
<input type="checkbox" name="status" value="1" id="input-status" class="form-check-input"{% if status %} checked{% endif %}/>
<input type="hidden" name="status" value="0"/> <input type="checkbox" name="status" value="1" id="input-status" class="form-check-input"{% if status %} checked{% endif %}/>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions upload/extension/opencart/admin/view/template/report/customer_order.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@
<div class="card-body">
<form id="form-filter">
<div class="mb-3">
<label for="input-customer" class="col-form-label">{{ entry_customer }}</label>
<label for="input-customer" class="form-label">{{ entry_customer }}</label>
<input type="text" name="filter_customer" value="{{ filter_customer }}" placeholder="{{ entry_customer }}" id="input-customer" data-oc-target="autocomplete-customer" class="form-control" autocomplete="off"/>
<ul id="autocomplete-customer" class="dropdown-menu"></ul>
</div>
<div class="mb-3">
<label for="input-order-status" class="col-form-label">{{ entry_order_status }}</label> <select name="filter_order_status_id" id="input-order-status" class="form-select">
<label for="input-order-status" class="form-label">{{ entry_order_status }}</label> <select name="filter_order_status_id" id="input-order-status" class="form-select">
<option value="0">{{ text_all_status }}</option>
{% for order_status in order_statuses %}
<option value="{{ order_status.order_status_id }}"{% if order_status.order_status_id == filter_order_status_id %} selected{% endif %}>{{ order_status.name }}</option>
{% endfor %}
</select>
</div>
<div class="mb-3">
<label for="input-date-start" class="col-form-label">{{ entry_date_start }}</label>
<label for="input-date-start" class="form-label">{{ entry_date_start }}</label>
<input type="date" name="filter_date_start" value="{{ filter_date_start }}" placeholder="{{ entry_date_start }}" id="input-date-start" class="form-control"/>
</div>
<div class="mb-3">
<label for="input-date-end" class="col-form-label">{{ entry_date_end }}</label>
<label for="input-date-end" class="form-label">{{ entry_date_end }}</label>
<input type="date" name="filter_date_end" value="{{ filter_date_end }}" placeholder="{{ entry_date_end }}" id="input-date-end" class="form-control"/>
</div>
<div class="text-end">
Expand Down
4 changes: 2 additions & 2 deletions upload/extension/opencart/admin/view/template/report/sale_coupon.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<div class="card-body">
<form id="form-filter">
<div class="mb-3">
<label for="input-date-start" class="col-form-label">{{ entry_date_start }}</label>
<label for="input-date-start" class="form-label">{{ entry_date_start }}</label>
<input type="date" name="filter_date_start" value="{{ filter_date_start }}" placeholder="{{ entry_date_start }}" id="input-date-start" class="form-control"/>
</div>
<div class="mb-3">
<label for="input-date-end" class="col-form-label">{{ entry_date_end }}</label>
<label for="input-date-end" class="form-label">{{ entry_date_end }}</label>
<input type="date" name="filter_date_end" value="{{ filter_date_end }}" placeholder="{{ entry_date_end }}" id="input-date-end" class="form-control"/>
</div>
<div class="text-end">
Expand Down
2 changes: 1 addition & 1 deletion upload/extension/opencart/admin/view/template/report/sale_return.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class="card-body">
<form id="form-filter">
<div class="mb-3">
<label for="input-group" class="col-form-label">{{ entry_group }}</label>
<label for="input-group" class="form-label">{{ entry_group }}</label>
<select name="filter_group" id="input-group" class="form-select">
{% for group in groups %}
<option value="{{ group.value }}"{% if group.value == filter_group %} selected{% endif %}>{{ group.text }}</option>
Expand Down

0 comments on commit 480f9a0

Please sign in to comment.