feat: implement multiple saved addresses with modal selector in checkout
- Add AddressController with full CRUD API for saved addresses - Implement address management UI in My Account > Addresses - Add modal-based address selector in checkout (Tokopedia-style) - Hide checkout forms when saved address is selected - Add search functionality in address modal - Auto-select default addresses on page load - Fix variable products to show 'Select Options' instead of 'Add to Cart' - Add admin toggle for multiple addresses feature - Clean up debug logs and fix TypeScript errors
This commit is contained in:
@@ -79,19 +79,7 @@ class AccountController {
|
||||
],
|
||||
]);
|
||||
|
||||
// Get addresses
|
||||
register_rest_route($namespace, '/account/addresses', [
|
||||
[
|
||||
'methods' => 'GET',
|
||||
'callback' => [__CLASS__, 'get_addresses'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
],
|
||||
[
|
||||
'methods' => 'POST',
|
||||
'callback' => [__CLASS__, 'update_addresses'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
],
|
||||
]);
|
||||
// Address routes moved to AddressController
|
||||
|
||||
// Get downloads (for digital products)
|
||||
register_rest_route($namespace, '/account/downloads', [
|
||||
@@ -330,34 +318,51 @@ class AccountController {
|
||||
* Format order data for API response
|
||||
*/
|
||||
private static function format_order($order, $detailed = false) {
|
||||
$payment_title = $order->get_payment_method_title();
|
||||
if (empty($payment_title)) {
|
||||
$payment_title = $order->get_payment_method() ?: 'Not specified';
|
||||
}
|
||||
|
||||
$data = [
|
||||
'id' => $order->get_id(),
|
||||
'order_number' => $order->get_order_number(),
|
||||
'status' => $order->get_status(),
|
||||
'date_created' => $order->get_date_created()->date('Y-m-d H:i:s'),
|
||||
'total' => $order->get_total(),
|
||||
'date' => $order->get_date_created()->date('Y-m-d H:i:s'),
|
||||
'total' => html_entity_decode(strip_tags(wc_price($order->get_total()))),
|
||||
'currency' => $order->get_currency(),
|
||||
'payment_method' => $order->get_payment_method_title(),
|
||||
'payment_method_title' => $payment_title,
|
||||
];
|
||||
|
||||
if ($detailed) {
|
||||
$data['items'] = array_map(function($item) {
|
||||
$items = $order->get_items();
|
||||
$data['items'] = is_array($items) ? array_values(array_map(function($item) {
|
||||
$product = $item->get_product();
|
||||
return [
|
||||
'id' => $item->get_id(),
|
||||
'name' => $item->get_name(),
|
||||
'quantity' => $item->get_quantity(),
|
||||
'total' => $item->get_total(),
|
||||
'total' => html_entity_decode(strip_tags(wc_price($item->get_total()))),
|
||||
'image' => $product ? wp_get_attachment_url($product->get_image_id()) : '',
|
||||
];
|
||||
}, $order->get_items());
|
||||
}, $items)) : [];
|
||||
|
||||
// Check if order needs shipping (not virtual-only)
|
||||
$needs_shipping = false;
|
||||
foreach ($order->get_items() as $item) {
|
||||
$product = $item->get_product();
|
||||
if ($product && !$product->is_virtual()) {
|
||||
$needs_shipping = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$data['billing'] = $order->get_address('billing');
|
||||
$data['shipping'] = $order->get_address('shipping');
|
||||
$data['subtotal'] = $order->get_subtotal();
|
||||
$data['shipping_total'] = $order->get_shipping_total();
|
||||
$data['tax_total'] = $order->get_total_tax();
|
||||
$data['discount_total'] = $order->get_discount_total();
|
||||
$data['needs_shipping'] = $needs_shipping;
|
||||
$data['subtotal'] = html_entity_decode(strip_tags(wc_price($order->get_subtotal())));
|
||||
$data['shipping_total'] = html_entity_decode(strip_tags(wc_price($order->get_shipping_total())));
|
||||
$data['tax_total'] = html_entity_decode(strip_tags(wc_price($order->get_total_tax())));
|
||||
$data['discount_total'] = html_entity_decode(strip_tags(wc_price($order->get_discount_total())));
|
||||
}
|
||||
|
||||
return $data;
|
||||
|
||||
241
includes/Frontend/AddressController.php
Normal file
241
includes/Frontend/AddressController.php
Normal file
@@ -0,0 +1,241 @@
|
||||
<?php
|
||||
namespace WooNooW\Frontend;
|
||||
|
||||
use WP_REST_Request;
|
||||
use WP_REST_Response;
|
||||
use WP_Error;
|
||||
|
||||
class AddressController {
|
||||
|
||||
/**
|
||||
* Register REST API routes
|
||||
*/
|
||||
public static function register_routes() {
|
||||
$namespace = 'woonoow/v1';
|
||||
|
||||
// Register GET and POST together to avoid route conflicts
|
||||
register_rest_route($namespace, '/account/addresses', [
|
||||
[
|
||||
'methods' => 'GET',
|
||||
'callback' => [__CLASS__, 'get_addresses'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
],
|
||||
[
|
||||
'methods' => 'POST',
|
||||
'callback' => [__CLASS__, 'create_address'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
],
|
||||
]);
|
||||
|
||||
// Update address
|
||||
register_rest_route($namespace, '/account/addresses/(?P<id>\d+)', [
|
||||
'methods' => 'PUT',
|
||||
'callback' => [__CLASS__, 'update_address'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
]);
|
||||
|
||||
// Delete address
|
||||
register_rest_route($namespace, '/account/addresses/(?P<id>\d+)', [
|
||||
'methods' => 'DELETE',
|
||||
'callback' => [__CLASS__, 'delete_address'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
]);
|
||||
|
||||
// Set default address
|
||||
register_rest_route($namespace, '/account/addresses/(?P<id>\d+)/set-default', [
|
||||
'methods' => 'POST',
|
||||
'callback' => [__CLASS__, 'set_default_address'],
|
||||
'permission_callback' => [__CLASS__, 'check_customer_permission'],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user is logged in
|
||||
*/
|
||||
public static function check_customer_permission() {
|
||||
return is_user_logged_in();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all addresses for current user
|
||||
*/
|
||||
public static function get_addresses(WP_REST_Request $request) {
|
||||
$user_id = get_current_user_id();
|
||||
$addresses = get_user_meta($user_id, 'woonoow_addresses', true);
|
||||
|
||||
if (!$addresses || !is_array($addresses)) {
|
||||
$addresses = [];
|
||||
}
|
||||
|
||||
$addresses = array_values($addresses);
|
||||
|
||||
return new WP_REST_Response($addresses, 200);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create new address
|
||||
*/
|
||||
public static function create_address(WP_REST_Request $request) {
|
||||
$user_id = get_current_user_id();
|
||||
$addresses = get_user_meta($user_id, 'woonoow_addresses', true);
|
||||
|
||||
if (!is_array($addresses)) {
|
||||
$addresses = [];
|
||||
}
|
||||
|
||||
// Generate new ID
|
||||
$new_id = empty($addresses) ? 1 : max(array_column($addresses, 'id')) + 1;
|
||||
|
||||
// Prepare address data
|
||||
$address = [
|
||||
'id' => $new_id,
|
||||
'label' => sanitize_text_field($request->get_param('label')),
|
||||
'type' => sanitize_text_field($request->get_param('type')), // 'billing', 'shipping', or 'both'
|
||||
'first_name' => sanitize_text_field($request->get_param('first_name')),
|
||||
'last_name' => sanitize_text_field($request->get_param('last_name')),
|
||||
'company' => sanitize_text_field($request->get_param('company')),
|
||||
'address_1' => sanitize_text_field($request->get_param('address_1')),
|
||||
'address_2' => sanitize_text_field($request->get_param('address_2')),
|
||||
'city' => sanitize_text_field($request->get_param('city')),
|
||||
'state' => sanitize_text_field($request->get_param('state')),
|
||||
'postcode' => sanitize_text_field($request->get_param('postcode')),
|
||||
'country' => sanitize_text_field($request->get_param('country')),
|
||||
'email' => sanitize_email($request->get_param('email')),
|
||||
'phone' => sanitize_text_field($request->get_param('phone')),
|
||||
'is_default' => (bool) $request->get_param('is_default'),
|
||||
];
|
||||
|
||||
// If this is set as default, unset other defaults of the same type
|
||||
if ($address['is_default']) {
|
||||
foreach ($addresses as &$addr) {
|
||||
if ($addr['type'] === $address['type'] || $addr['type'] === 'both' || $address['type'] === 'both') {
|
||||
$addr['is_default'] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$addresses[] = $address;
|
||||
|
||||
update_user_meta($user_id, 'woonoow_addresses', $addresses);
|
||||
|
||||
return new WP_REST_Response($address, 201);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update existing address
|
||||
*/
|
||||
public static function update_address(WP_REST_Request $request) {
|
||||
$user_id = get_current_user_id();
|
||||
$address_id = (int) $request->get_param('id');
|
||||
$addresses = get_user_meta($user_id, 'woonoow_addresses', true);
|
||||
|
||||
if (!is_array($addresses)) {
|
||||
return new WP_Error('no_addresses', 'No addresses found', ['status' => 404]);
|
||||
}
|
||||
|
||||
$found = false;
|
||||
foreach ($addresses as &$addr) {
|
||||
if ($addr['id'] === $address_id) {
|
||||
$found = true;
|
||||
|
||||
// Update fields
|
||||
$addr['label'] = sanitize_text_field($request->get_param('label'));
|
||||
$addr['type'] = sanitize_text_field($request->get_param('type'));
|
||||
$addr['first_name'] = sanitize_text_field($request->get_param('first_name'));
|
||||
$addr['last_name'] = sanitize_text_field($request->get_param('last_name'));
|
||||
$addr['company'] = sanitize_text_field($request->get_param('company'));
|
||||
$addr['address_1'] = sanitize_text_field($request->get_param('address_1'));
|
||||
$addr['address_2'] = sanitize_text_field($request->get_param('address_2'));
|
||||
$addr['city'] = sanitize_text_field($request->get_param('city'));
|
||||
$addr['state'] = sanitize_text_field($request->get_param('state'));
|
||||
$addr['postcode'] = sanitize_text_field($request->get_param('postcode'));
|
||||
$addr['country'] = sanitize_text_field($request->get_param('country'));
|
||||
$addr['email'] = sanitize_email($request->get_param('email'));
|
||||
$addr['phone'] = sanitize_text_field($request->get_param('phone'));
|
||||
$addr['is_default'] = (bool) $request->get_param('is_default');
|
||||
|
||||
// If this is set as default, unset other defaults of the same type
|
||||
if ($addr['is_default']) {
|
||||
foreach ($addresses as &$other_addr) {
|
||||
if ($other_addr['id'] !== $address_id) {
|
||||
if ($other_addr['type'] === $addr['type'] || $other_addr['type'] === 'both' || $addr['type'] === 'both') {
|
||||
$other_addr['is_default'] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$found) {
|
||||
return new WP_Error('address_not_found', 'Address not found', ['status' => 404]);
|
||||
}
|
||||
|
||||
update_user_meta($user_id, 'woonoow_addresses', $addresses);
|
||||
|
||||
return new WP_REST_Response(['success' => true], 200);
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete address
|
||||
*/
|
||||
public static function delete_address(WP_REST_Request $request) {
|
||||
$user_id = get_current_user_id();
|
||||
$address_id = (int) $request->get_param('id');
|
||||
$addresses = get_user_meta($user_id, 'woonoow_addresses', true);
|
||||
|
||||
if (!is_array($addresses)) {
|
||||
return new WP_Error('no_addresses', 'No addresses found', ['status' => 404]);
|
||||
}
|
||||
|
||||
$addresses = array_filter($addresses, function($addr) use ($address_id) {
|
||||
return $addr['id'] !== $address_id;
|
||||
});
|
||||
|
||||
// Re-index array
|
||||
$addresses = array_values($addresses);
|
||||
|
||||
update_user_meta($user_id, 'woonoow_addresses', $addresses);
|
||||
|
||||
return new WP_REST_Response(['success' => true], 200);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set address as default
|
||||
*/
|
||||
public static function set_default_address(WP_REST_Request $request) {
|
||||
$user_id = get_current_user_id();
|
||||
$address_id = (int) $request->get_param('id');
|
||||
$addresses = get_user_meta($user_id, 'woonoow_addresses', true);
|
||||
|
||||
if (!is_array($addresses)) {
|
||||
return new WP_Error('no_addresses', 'No addresses found', ['status' => 404]);
|
||||
}
|
||||
|
||||
$found = false;
|
||||
$address_type = null;
|
||||
|
||||
foreach ($addresses as &$addr) {
|
||||
if ($addr['id'] === $address_id) {
|
||||
$found = true;
|
||||
$address_type = $addr['type'];
|
||||
$addr['is_default'] = true;
|
||||
} else {
|
||||
// Unset default for addresses of the same type
|
||||
if ($address_type && ($addr['type'] === $address_type || $addr['type'] === 'both' || $address_type === 'both')) {
|
||||
$addr['is_default'] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!$found) {
|
||||
return new WP_Error('address_not_found', 'Address not found', ['status' => 404]);
|
||||
}
|
||||
|
||||
update_user_meta($user_id, 'woonoow_addresses', $addresses);
|
||||
|
||||
return new WP_REST_Response(['success' => true], 200);
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,6 @@ class CartController {
|
||||
// Check if this is a cart endpoint
|
||||
$request_uri = $_SERVER['REQUEST_URI'] ?? '';
|
||||
if (strpos($request_uri, '/woonoow/v1/cart') !== false) {
|
||||
error_log('WooNooW Cart: Bypassing authentication for cart endpoint');
|
||||
return true; // Allow access
|
||||
}
|
||||
|
||||
@@ -37,7 +36,6 @@ class CartController {
|
||||
* Register REST API routes
|
||||
*/
|
||||
public static function register_routes() {
|
||||
error_log('WooNooW CartController::register_routes() START');
|
||||
$namespace = 'woonoow/v1';
|
||||
|
||||
// Get cart
|
||||
@@ -46,7 +44,6 @@ class CartController {
|
||||
'callback' => [__CLASS__, 'get_cart'],
|
||||
'permission_callback' => '__return_true',
|
||||
]);
|
||||
error_log('WooNooW CartController: GET /cart registered: ' . ($result ? 'SUCCESS' : 'FAILED'));
|
||||
|
||||
// Add to cart
|
||||
$result = register_rest_route($namespace, '/cart/add', [
|
||||
@@ -73,7 +70,6 @@ class CartController {
|
||||
],
|
||||
],
|
||||
]);
|
||||
error_log('WooNooW CartController: POST /cart/add registered: ' . ($result ? 'SUCCESS' : 'FAILED'));
|
||||
|
||||
// Update cart item
|
||||
register_rest_route($namespace, '/cart/update', [
|
||||
|
||||
Reference in New Issue
Block a user