Skip to content

Commit

Permalink
Merge pull request #1 from sofyansitorus/v1.2.4
Browse files Browse the repository at this point in the history 
V1.2.4
  • Loading branch information
@sofyansitorus
sofyansitorus authored Feb 12, 2018
2 parents 37a7b50 + 556af33 commit ce2564f
Show file tree
Hide file tree
Showing 6 changed files with 492 additions and 71 deletions.
10 changes: 7 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WooCommerce per kilometer shipping rates calculator for GoSend Go-Jek Indonesia
**Contributors:** [sofyansitorus](https://profiles.wordpress.org/sofyansitorus)<br>
**Tags:** [woocommerce shipping](https://wordpress.org/plugins/tags/woocommerce shipping), [go-jek](https://wordpress.org/plugins/tags/go-jek), [ojek shipping](https://wordpress.org/plugins/tags/ojek shipping), [gosend](https://wordpress.org/plugins/tags/gosend), [gojek shipping](https://wordpress.org/plugins/tags/gojek shipping)<br>
**Requires at least:** 4.8<br>
**Tested up to:** 4.9.2<br>
**Tested up to:** 4.9.4<br>
**Stable tag:** trunk (master)<br>
**License:** [GPL-2.0+](http://www.gnu.org/licenses/gpl-2.0.txt)<br>
**Requires PHP:** 5.6<br>
Expand Down Expand Up @@ -97,6 +97,10 @@ I always welcome and encourage contributions to this plugin. Please visit the pl

## Changelog ##

### 1.2.4 ###
* Improvements - Add Maps Place Picker.
* Fix - Fix issue when using comma as decimal dlimeter.

### 1.2.3 ###
* Fix - Remove Maps Place Picker.

Expand Down Expand Up @@ -138,7 +142,7 @@ I always welcome and encourage contributions to this plugin. Please visit the pl

## Upgrade Notice ##

### 1.2.3 ###
This version include bug fix Maps Picker. Upgrade immediately.
### 1.2.4 ###
This version include bug fixes and improvements. Upgrade immediately.


11 changes: 8 additions & 3 deletions README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Contributors: sofyansitorus
Tags: woocommerce shipping,go-jek,ojek shipping,gosend,gojek shipping
Requires at least: 4.8
Tested up to: 4.9.2
Tested up to: 4.9.4
Requires PHP: 5.6
Stable tag: trunk
License: GPL-2.0+
Expand Down Expand Up @@ -83,6 +83,11 @@ I always welcome and encourage contributions to this plugin. Please visit the pl

== Changelog ==

= 1.2.4 =

* Improvements - Add Maps Place Picker.
* Fix - Fix issue when using comma as decimal dlimeter.

= 1.2.3 =

* Fix - Remove Maps Place Picker.
Expand Down Expand Up @@ -132,5 +137,5 @@ I always welcome and encourage contributions to this plugin. Please visit the pl

== Upgrade Notice ==

= 1.2.3 =
This version include bug fix Maps Picker. Upgrade immediately.
= 1.2.4 =
This version include bug fixes and improvements. Upgrade immediately.
268 changes: 268 additions & 0 deletions assets/js/woogosend-admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
"use strict";

var wooGoSend = {
_inputLatId: "woocommerce_woogosend_origin_lat",
_inputLngId: "woocommerce_woogosend_origin_lng",
_mapWrapperId: "woogosend-map-wrapper",
_mapSearchId: "woogosend-map-search",
_mapCanvasId: "woogosend-map-canvas",
_zoomLevel: 16,
_keyStr:
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
init: function() {
var self = this;

Expand Down Expand Up @@ -31,6 +39,266 @@
}
}, 200);
}
// Handle setting link clicked.
$(document).on("click", ".wc-shipping-zone-method-settings", function() {
if (
$(this)
.closest("tr")
.find(".wc-shipping-zone-method-type")
.text() === woogosend_params.method_title
) {
self._initGoogleMaps();
}
});
},
_initGoogleMaps: function(e) {
var self = this;
try {
if (
typeof google === "undefined" ||
typeof google.maps === "undefined"
) {
throw "google is not defined";
}

self._buildGoogleMaps();
} catch (error) {
$.getScript(
"https://maps.googleapis.com/maps/api/js?key=" +
self._decode($("#map-secret-key").val()) +
"&libraries=geometry,places&&language=" +
woogosend_params.language,
function() {
self._buildGoogleMaps();
}
);
}
},
_buildGoogleMaps: function() {
var self = this;
var curLat = $("#" + self._inputLatId).val();
var curLng = $("#" + self._inputLngId).val();
curLat = curLat.length ? parseFloat(curLat) : -6.175392;
curLng = curLng.length ? parseFloat(curLng) : 106.827153;
var curLatLng = {
lat: curLat,
lng: curLng
};
var tmplMapCanvas = wp.template(self._mapCanvasId);
var tmplMapSearch = wp.template(self._mapSearchId);
if (!$("#" + self._mapCanvasId).length) {
$("#" + self._mapWrapperId).append(
tmplMapCanvas({
map_canvas_id: self._mapCanvasId
})
);
}
var markers = [];
var map = new google.maps.Map(
document.getElementById(self._mapCanvasId),
{
center: curLatLng,
zoom: self._zoomLevel,
mapTypeId: "roadmap"
}
);
var marker = new google.maps.Marker({
map: map,
position: curLatLng,
draggable: true,
icon: woogosend_params.marker
});
var infowindow = new google.maps.InfoWindow({
maxWidth: 350,
content: woogosend_params.txt.drag_marker
});
infowindow.open(map, marker);
google.maps.event.addListener(marker, "dragstart", function(event) {
infowindow.close();
});
google.maps.event.addListener(marker, "dragend", function(event) {
self._setLatLng(event.latLng, marker, map, infowindow);
});
markers.push(marker);
if (!$("#" + self._mapSearchId).length) {
$("#" + self._mapWrapperId).append(
tmplMapSearch({
map_search_id: self._mapSearchId
})
);
}
// Create the search box and link it to the UI element.
var inputAddress = document.getElementById(self._mapSearchId);
var searchBox = new google.maps.places.SearchBox(inputAddress);
map.controls[google.maps.ControlPosition.TOP_LEFT].push(inputAddress);
// Bias the SearchBox results towards current map's viewport.
map.addListener("bounds_changed", function() {
searchBox.setBounds(map.getBounds());
});
// Listen for the event fired when the user selects a prediction and retrieve more details for that place.
searchBox.addListener("places_changed", function() {
var places = searchBox.getPlaces();
if (places.length === 0) {
return;
}
// Clear out the old markers.
markers.forEach(function(marker) {
marker.setMap(null);
});
markers = [];
// For each place, get the icon, name and location.
var bounds = new google.maps.LatLngBounds();
places.forEach(function(place) {
if (!place.geometry) {
console.log("Returned place contains no geometry");
return;
}
marker = new google.maps.Marker({
map: map,
position: place.geometry.location,
draggable: true,
icon: woogosend_params.marker
});
self._setLatLng(place.geometry.location, marker, map, infowindow);
google.maps.event.addListener(marker, "dragstart", function(event) {
infowindow.close();
});
google.maps.event.addListener(marker, "dragend", function(event) {
self._setLatLng(event.latLng, marker, map, infowindow);
});
// Create a marker for each place.
markers.push(marker);
if (place.geometry.viewport) {
// Only geocodes have viewport.
bounds.union(place.geometry.viewport);
} else {
bounds.extend(place.geometry.location);
}
});
map.setZoom(self._zoomLevel);
map.fitBounds(bounds);
});
},
_setLatLng: function(location, marker, map, infowindow) {
var self = this;
var geocoder = new google.maps.Geocoder();
geocoder.geocode(
{
latLng: location
},
function(results, status) {
if (status == google.maps.GeocoderStatus.OK) {
if (results[0]) {
infowindow.setContent(results[0].formatted_address);
infowindow.open(map, marker);
$("#" + self._inputLatId).val(location.lat());
$("#" + self._inputLngId).val(location.lng());
} else {
$("#" + self._inputLatId).val("");
$("#" + self._inputLngId).val("");
}
}
}
);
map.setCenter(location);
},
_encode: function(e) {
var self = this;
var t = "";
var n, r, i, s, o, u, a;
var f = 0;
e = self._utf8_encode(e);
while (f < e.length) {
n = e.charCodeAt(f++);
r = e.charCodeAt(f++);
i = e.charCodeAt(f++);
s = n >> 2;
o = ((n & 3) << 4) | (r >> 4);
u = ((r & 15) << 2) | (i >> 6);
a = i & 63;
if (isNaN(r)) {
u = a = 64;
} else if (isNaN(i)) {
a = 64;
}
t =
t +
this._keyStr.charAt(s) +
this._keyStr.charAt(o) +
this._keyStr.charAt(u) +
this._keyStr.charAt(a);
}
return t;
},
_decode: function(e) {
var self = this;
var t = "";
var n, r, i;
var s, o, u, a;
var f = 0;
e = e.replace(/[^A-Za-z0-9+/=]/g, "");
while (f < e.length) {
s = this._keyStr.indexOf(e.charAt(f++));
o = this._keyStr.indexOf(e.charAt(f++));
u = this._keyStr.indexOf(e.charAt(f++));
a = this._keyStr.indexOf(e.charAt(f++));
n = (s << 2) | (o >> 4);
r = ((o & 15) << 4) | (u >> 2);
i = ((u & 3) << 6) | a;
t = t + String.fromCharCode(n);
if (u != 64) {
t = t + String.fromCharCode(r);
}
if (a != 64) {
t = t + String.fromCharCode(i);
}
}
t = self._utf8_decode(t);
return t;
},
_utf8_encode: function(e) {
e = e.replace(/rn/g, "n");
var t = "";
for (var n = 0; n < e.length; n++) {
var r = e.charCodeAt(n);
if (r < 128) {
t += String.fromCharCode(r);
} else if (r > 127 && r < 2048) {
t += String.fromCharCode((r >> 6) | 192);
t += String.fromCharCode((r & 63) | 128);
} else {
t += String.fromCharCode((r >> 12) | 224);
t += String.fromCharCode(((r >> 6) & 63) | 128);
t += String.fromCharCode((r & 63) | 128);
}
}
return t;
},
_utf8_decode: function(e) {
var t = "";
var n = 0;
var r = 0;
var c1 = 0;
var c2 = 0;
while (n < e.length) {
r = e.charCodeAt(n);
if (r < 128) {
t += String.fromCharCode(r);
n++;
} else if (r > 191 && r < 224) {
c2 = e.charCodeAt(n + 1);
t += String.fromCharCode(((r & 31) << 6) | (c2 & 63));
n += 2;
} else {
c2 = e.charCodeAt(n + 1);
c3 = e.charCodeAt(n + 2);
t += String.fromCharCode(
((r & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)
);
n += 3;
}
}
return t;
}
};

Expand Down
2 changes: 1 addition & 1 deletion assets/js/woogosend-admin.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ce2564f

Please sign in to comment.