Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rent fix #232

Merged
merged 5 commits into from
Apr 25, 2024
Merged

Rent fix #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9dc828e
fix: item view button
nsavinda Apr 25, 2024
92bfde7
fix:profile image upload
nsavinda Apr 25, 2024
3960f71
fix:equipment file type
nsavinda Apr 25, 2024
d40b537
fix:equipment file type in update
nsavinda Apr 25, 2024
9808512
feat:unpaid order pay
nsavinda Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions app/controllers/API/Pay.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,43 @@ public function fullPay(string $a = '', string $b = '', string $c = ''):void {



}

public function unpaid(string $a = '', string $b = '', string $c = ''):void {
AuthorizationMiddleware::authorize(['customer']);

$request = new JSONRequest();
$response = new JSONResponse();

$payment = new PaymentModel;

$data['payments'] = $payment->first($request->getAll());

$merchant_id = MERCHANT_ID;
$merchant_secret = MERCHANT_SECRET;

$hash = strtoupper(
md5(
$merchant_id .
$data['payments']->reference_number .
// number_format($order->totalAmount, 2, '.', '') .
$data['payments']->amount .
'LKR' .
strtoupper(md5($merchant_secret))
)
);

$data['hash'] = $hash;
$data['merchant_id'] = $merchant_id;
$data['orderId'] = $data['payments']->reference_number;
$data['amount'] = $data['payments']->amount;

$response->data($data)->statusCode(200)->send();





}

}
Expand Down
2 changes: 1 addition & 1 deletion app/views/customer/components/items.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<i class="fa fa-star-half-o" aria-hidden="true"></i>
<i class="fa fa-star-o" aria-hidden="true"></i>
</div> -->
<button class="btn btn-primary">Add to Cart</button>
<button class="btn btn-primary">View</button>
</div>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions app/views/customer/components/orderlist.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<?php



($orders) ? :print('<div class="col-lg-12 mih-100px flex-d justify-content-center
align-items-center text-center"><h2>No Orders</h2></div>');
Comment on lines +6 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure proper handling of empty orders. The ternary operation should be corrected for better readability and functionality.

- ($orders) ?  :print('<div class="col-lg-12 mih-100px flex-d justify-content-center
- align-items-center text-center"><h2>No Orders</h2></div>');
+ if (empty($orders)) {
+     echo '<div class="col-lg-12 mih-100px flex-d justify-content-center align-items-center text-center"><h2>No Orders</h2></div>';
+ }
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
($orders) ? :print('<div class="col-lg-12 mih-100px flex-d justify-content-center
align-items-center text-center"><h2>No Orders</h2></div>');
if (empty($orders)) {
echo '<div class="col-lg-12 mih-100px flex-d justify-content-center align-items-center text-center"><h2>No Orders</h2></div>';
}



foreach ($orders as $order) {
Expand Down Expand Up @@ -31,7 +32,8 @@


<?php if ($order->payment_status == 'pending') { ?>
<button class="btn-text-blue order-pay-button"><i class="fa fa-credit-card" aria-hidden="true"></i> Pay</button>
<button data-id="<?php echo $order->reference_number; ?>"
class="btn-text-blue order-pay-button"><i class="fa fa-credit-card" aria-hidden="true"></i> Pay</button>
<?php } ?>

<?php if ($order->rent_status == 'rented') { ?>
Expand Down
31 changes: 31 additions & 0 deletions app/views/customer/orders.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,37 @@ function loadOrders(status = 'all') {
});


// Pay button for unpaid
$(document).on('click','.order-pay-button', function() {
var referenceNo = $(this).closest('button').attr('data-id');
console.log(referenceNo);
showLoader();
// open pay modal
$.ajax({
url: '<?= ROOT_DIR ?>/api/pay/unpaid',
headers: {
'Authorization': 'Bearer ' + getCookie('jwt_auth_token')
},
type: 'POST',
data: JSON.stringify({
reference_number: referenceNo
}),
contentType: 'application/json',
success: function(data) {
paymentGateWay(data.data);

},
error: function(data) {
console.log(data);
alertmsg('Error loading payment details', 'error');
hideLoader();
}

});

});



function paymentGateWay(data) {
console.log("Payment gateway");
Expand Down
2 changes: 1 addition & 1 deletion app/views/rental/components/equipment.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@


<label for="equipment-image">Equipment Image</label>
<input type="file" id="equipment-image" class="form-control-lg" name="equipment_image" >
<input type="file" id="equipment-image" class="form-control-lg" name="equipment_image" accept="image/*">


</div>
Expand Down
24 changes: 23 additions & 1 deletion app/views/rental/equipments.view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
<h2>Upload Equipment Images</h2>
<!-- Equipment image upload form -->
<form method="post" enctype="multipart/form-data">
<input type="file" name="equipment_images[]" id="equipment-image-input" class="form-control-lg" accept="image/png, image/jpg, image/gif, image/jpeg" multiple required>
<input type="file" name="equipment_images[]" id="equipment-image-input" class="form-control-lg" accept="image/png, image/jpg, image/gif, image/jpeg , image/webp" required>
<div class="equipment-image-preview-container flex-d mt-2 align-items-center" id="equipment-image-preview"></div>
<input type="submit" class="btn mt-4" name="submit" value="Select Images" id="equipment-image-submit">
</form>
Expand All @@ -236,6 +236,15 @@
var imgContainer = $('<div/>', { 'class': 'img-preview-item' });
var img = $('<img>', { 'class': 'image-preview' }).appendTo(imgContainer);

// validate file type
var fileType = file['type'];
var validImageTypes = ['image/jpeg', 'image/png', 'image/jpg', 'image/gif', 'image/webp'];
if (!validImageTypes.includes(fileType)) {
alertmsg('Invalid file type. Please select an image file' , 'error');
// clear
$('#equipment-image-input').val('');
return;
}


var removeButton = $('<button/>', {
Expand Down Expand Up @@ -803,9 +812,22 @@ function filterEquipment() {

formData.append('json', JSON.stringify(jsonData));






if (formData.get('equipment_image') != '') {
var image = formData.get('equipment_image');

// validate file type
var fileType = image['type'];
var validImageTypes = ['image/jpeg', 'image/png', 'image/jpg', 'image/gif', 'image/webp'];
if (!validImageTypes.includes(fileType)) {
alertmsg('Invalid file type. Please select an image file' , 'error');
return;
}

formData.append('image', image);


Expand Down
4 changes: 2 additions & 2 deletions app/views/rental/layout/sidebar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ function toggleSidebar() {
</form> -->
<!-- With image preview -->
<form method="post" enctype="multipart/form-data">
<input type="file" name="image" id="profile-image-input" class="form-control-lg" accept="image/png, image/jpg, image/gif, image/jpeg" required>
<input type="file" name="image" id="profile-image-input" class="form-control-lg" accept="image/png, image/jpg, image/gif, image/jpeg , image/webp" required>
<div class="image-preview-container flex-d-c align-items-center">


Expand Down Expand Up @@ -305,7 +305,7 @@ function toggleSidebar() {
alertmsg('Image uploaded successfully','success');
$('#image-upload').css('display', 'none');

$('.profile-image').attr('src', '<?= ROOT_DIR ?>/uploads/images/rental_services/' + data.image);
$('.profile-image').attr('src', '<?= ROOT_DIR ?>/uploads/images/rental_services/' + data.data.image);
// $('#profile-image-input').val('');
// $('#image-preview').attr('src', '');
// location.reload();
Expand Down
Loading