Skip to content

Commit

Permalink
Merge pull request #2 from manutheblacker/development/manutheblacker-…
Browse files Browse the repository at this point in the history 
…improvments

Merge branch develop from manutheblacker into sendbox core production branch
  • Loading branch information
@manutheblacker
manutheblacker authored Mar 6, 2021
2 parents 71d8bdb + 55dce28 commit e29ef08
Show file tree
Hide file tree
Showing 8 changed files with 1,115 additions and 1,145 deletions.
Binary file modified README.md
View file
Binary file not shown.
981 changes: 489 additions & 492 deletions admin/class-wooss-admin.php
View file

Large diffs are not rendered by default.

370 changes: 187 additions & 183 deletions admin/js/wooss-admin.js
View file
Original file line number Diff line number Diff line change
@@ -1,189 +1,193 @@
(function($) {
"use strict";

/**
* All of the code for your public-facing JavaScript source
* should reside in this file.
*
* Note: It has been assumed you will write jQuery code here, so the
* $ function reference has been prepared for usage within the scope
* of this function.
*
* This enables you to define handlers, for when the DOM is ready:
*
* $(function() {
*
* });
*
* When the window is loaded:
*
* $( window ).load(function() {
*
* });
*
* ...and/or other possibilities.
*
* Ideally, it is not considered best practise to attach more than a
* single DOM-ready or window-load handler for a particular page.
* Although scripts in the WordPress core, Plugins and Themes may be
* practising this, we should strive to set a better example in our own work.
*/

/* $(window).load(function () {
$('.loader').fadeOut();
}); */

$(document).ready(function() {
var select_choosed = $('select[name="wc_order_action"]').val();
$('select[name="wc_order_action"]').change(function() {
select_choosed = this.value;
if (select_choosed == "sendbox_shipping_action") {
$("button.button.wc-reload").on("click submit", function(e) {
e.preventDefault();
$("span#wooss_shipments_data").dialog();
(function ($) {
"use strict";

/**
* All of the code for your public-facing JavaScript source
* should reside in this file.
*
* Note: It has been assumed you will write jQuery code here, so the
* $ function reference has been prepared for usage within the scope
* of this function.
*
* This enables you to define handlers, for when the DOM is ready:
*
* $(function() {
*
* });
*
* When the window is loaded:
*
* $( window ).load(function() {
*
* });
*
* ...and/or other possibilities.
*
* Ideally, it is not considered best practise to attach more than a
* single DOM-ready or window-load handler for a particular page.
* Although scripts in the WordPress core, Plugins and Themes may be
* practising this, we should strive to set a better example in our own work.
*/

/* $(window).load(function () {
$('.loader').fadeOut();
}); */

$(document).ready(function () {
$('select#wooss_destination_country').select2();
$('select#wooss_destination_state').select2();
var select_choosed = $('select[name="wc_order_action"]').val();
$('select[name="wc_order_action"]').change(function () {
select_choosed = this.value;
if (select_choosed == "sendbox_shipping_action") {
$("button.button.wc-reload").on("click submit", function (e) {
e.preventDefault();
$("span#wooss_shipments_data").dialog();
});
} else {
$("span#wooss_shipments_data").hide();
}
});
} else {
$("span#wooss_shipments_data").hide();
}
});

var request_shipment_btn = $("button#wooss_request_shipment");
request_shipment_btn.on("submit click", function(e) {
e.preventDefault();
var wooss_origin_name = $("input[name='wooss_origin_name']").val();
var wooss_origin_phone = $("input[name='wooss_origin_phone']").val();
var wooss_origin_email = $("input[name='wooss_origin_email']").val();
var wooss_origin_country = $("input[name='wooss_origin_country']").val();
var wooss_origin_street = $("input[name='wooss_origin_street']").val();
var wooss_origin_state = $("input[name='wooss_origin_state']").val();
var wooss_origin_city = $("input[name='wooss_origin_city']").val();

var wooss_destination_name = $(
"input[name = 'wooss_destination_name']"
).val();

var wooss_destination_phone = $(
"input[name = 'wooss_destination_phone']"
).val();
var wooss_destination_email = $(
"input[name = 'wooss_destination_email']"
).val();
var wooss_destination_street = $(
"input[name = 'wooss_destination_street']"
).val();
/* var wooss_destination_country = $(
"input[name = 'wooss_destination_country']"
).val();
var wooss_destination_state = $(
"input[name = 'wooss_destination_state']"
).val();*/

var wooss_destination_city = $("input[name = 'wooss_destination_city']").val();
var wooss_postal_code = $(
"input#wooss_postal_code"
).val();
console.log(wooss_postal_code)
var wooss_selected_courier = $("select#wooss_selected_courier").val();
$("select#wooss_selected_courier").change(function() {
wooss_selected_courier = $(this).val();
//console.log(wooss_selected_courier, "hahh");
});

var wooss_destination_country = $("select#wooss_destination_country").val();
$("select#wooss_destination_country").change(function(){
wooss_destination_country = $(this).val();

})

var wooss_destination_state = $("select#wooss_destination_state").val();
$("select#wooss_destination_state").change(function(){
wooss_destination_state = $(this).val()
})


var wooss_country_destination_name = $("input#wooss_destination_city_name").val();



var wooss_order_id = $("textarea#wooss_items_list").data("id");
$.blockUI({message:'Requesting shipment...'});
var data = {
wooss_origin_name: wooss_origin_name,
wooss_origin_phone: wooss_origin_phone,
wooss_origin_email: wooss_origin_email,
wooss_origin_country: wooss_origin_country,
wooss_origin_state: wooss_origin_state,
wooss_origin_city: wooss_origin_city,
wooss_origin_street: wooss_origin_street,

wooss_destination_name: wooss_destination_name,
wooss_destination_phone: wooss_destination_phone,
wooss_destination_email: wooss_destination_email,
wooss_destination_country: wooss_destination_country,
wooss_destination_state: wooss_destination_state,
wooss_destination_street: wooss_destination_street,
wooss_destination_city: wooss_country_destination_name,
wooss_selected_courier: wooss_selected_courier,
wooss_postal_code:wooss_postal_code,


wooss_order_id: wooss_order_id
};
//console.log(wooss_destination_state);

$.post(
wooss_ajax_object.wooss_ajax_url,
{
action: "request_shipments",
data: data,
security: wooss_ajax_object.wooss_ajax_security
},
function(response) {

$.unblockUI();
if (response == 0) {
alert("An error occured");
} else if (response == 1) {
window.location.reload();
} else if (response == 2 || response == 3 ) {
alert(
"insufficient funds login to your sendbox account and top up your wallet"
var request_shipment_btn = $("button#wooss_request_shipment");
request_shipment_btn.on("submit click", function (e) {
e.preventDefault();
var wooss_origin_name = $("input[name='wooss_origin_name']").val();
var wooss_origin_phone = $("input[name='wooss_origin_phone']").val();
var wooss_origin_email = $("input[name='wooss_origin_email']").val();
var wooss_origin_country = $("input[name='wooss_origin_country']").val();
var wooss_origin_street = $("input[name='wooss_origin_street']").val();
var wooss_origin_state = $("input[name='wooss_origin_state']").val();
var wooss_origin_city = $("input[name='wooss_origin_city']").val();

var wooss_destination_name = $(
"input[name = 'wooss_destination_name']"
).val();

var wooss_destination_phone = $(
"input[name = 'wooss_destination_phone']"
).val();
var wooss_destination_email = $(
"input[name = 'wooss_destination_email']"
).val();
var wooss_destination_street = $(
"input[name = 'wooss_destination_street']"
).val();
/* var wooss_destination_country = $(
"input[name = 'wooss_destination_country']"
).val();
var wooss_destination_state = $(
"input[name = 'wooss_destination_state']"
).val();*/

var wooss_destination_city = $("input[name = 'wooss_destination_city']").val();
var wooss_postal_code = $(
"input#wooss_postal_code"
).val();

var wooss_selected_courier = $("select#wooss_selected_courier").val();
$("select#wooss_selected_courier").change(function () {
wooss_selected_courier = $(this).val();
//console.log(wooss_selected_courier, "hahh");
});

var wooss_destination_country = $("select#wooss_destination_country").val();
$("select#wooss_destination_country").change(function () {
wooss_destination_country = $(this).val();

})

var wooss_destination_state = $("select#wooss_destination_state").val();
$("select#wooss_destination_state").change(function () {
wooss_destination_state = $(this).val()
})


var wooss_country_destination_name = $("input#wooss_destination_city_name").val();


var wooss_order_id = $("textarea#wooss_items_list").data("id");
$.blockUI({message: 'Requesting shipment...'});
var data = {
wooss_origin_name: wooss_origin_name,
wooss_origin_phone: wooss_origin_phone,
wooss_origin_email: wooss_origin_email,
wooss_origin_country: wooss_origin_country,
wooss_origin_state: wooss_origin_state,
wooss_origin_city: wooss_origin_city,
wooss_origin_street: wooss_origin_street,

wooss_destination_name: wooss_destination_name,
wooss_destination_phone: wooss_destination_phone,
wooss_destination_email: wooss_destination_email,
wooss_destination_country: wooss_destination_country,
wooss_destination_state: wooss_destination_state,
wooss_destination_street: wooss_destination_street,
wooss_destination_city: wooss_country_destination_name,
wooss_selected_courier: wooss_selected_courier,
wooss_postal_code: wooss_postal_code,


wooss_order_id: wooss_order_id
};
//console.log(wooss_destination_state);

$.post(
wooss_ajax_object.wooss_ajax_url,
{
action: "request_shipments",
data: data,
security: wooss_ajax_object.wooss_ajax_security
},
function (response) {

$.unblockUI();
if (response == 0) {
alert("An error occured");
} else if (response == 1) {
window.location.reload();
} else if (response == 2 || response == 3) {
alert(
"insufficient funds login to your sendbox account and top up your wallet"
);
}
}
);
}
}
);
});
});

$("select#wooss_selected_courier").change(function(event) {
let price =
event.target.options[event.target.selectedIndex].dataset.courierPrice;
document.getElementById("dabs").innerText = "Fee: ₦" + price;
document.getElementById("dabs").style.color = "#ed2f59";
//console.log(wooss_selected_courier, "hahh");
});
/***function to display rates */

/***Function to get country code**/
var wooss_selected_country, wooss_selected_country_code;
$("select#wooss_destination_country").on('change ',function(){
var wooss_selected_option = jQuery(this).children("option:selected");
wooss_selected_country = wooss_selected_option.val();
wooss_selected_country_code = wooss_selected_option.data("countryCode"); $.blockUI();
$.post(wooss_ajax_object.wooss_ajax_url,{action: "request_states",
data: wooss_selected_country_code,
security: wooss_ajax_object.wooss_ajax_security},
function(response){
if (response){
$("select#wooss_destination_state option:gt(0)").remove();
$('select#wooss_destination_state').append(response);
$.unblockUI();
}
});


});
$("select#wooss_selected_courier").change(function (event) {
let price =
event.target.options[event.target.selectedIndex].dataset.courierPrice;
document.getElementById("dabs").innerText = "Fee: ₦" + price;
document.getElementById("dabs").style.color = "#ed2f59";
//console.log(wooss_selected_courier, "hahh");
});
/***function to display rates */


/***Function to get country code**/
var wooss_selected_country, wooss_selected_country_code;
$("select#wooss_destination_country").on('change ', function () {
var wooss_selected_option = jQuery(this).children("option:selected");
wooss_selected_country = wooss_selected_option.val();
wooss_selected_country_code = wooss_selected_option.data("countryCode");
$.blockUI();

$.post(wooss_ajax_object.wooss_ajax_url, {
action: "request_states",
data: wooss_selected_country_code,
security: wooss_ajax_object.wooss_ajax_security
},
function (response) {
if (response) {
$("select#wooss_destination_state option:gt(0)").remove();
$('select#wooss_destination_state').append(response);
$.unblockUI();
}
});

});

});

});
})(jQuery);
Loading

0 comments on commit e29ef08

Please sign in to comment.