webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
franknstayn
2021-10-06 21:26:36 +08:00
parent 0e534ad723
commit eea777b544
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -182,16 +182,25 @@ class PaypalController extends Controller
$item_list = PayPal::ItemList(); $item_list = PayPal::ItemList();
$item_list->setItems($order_items); $item_list->setItems($order_items);
$payment = PayPal::Payment();
$shipping = PayPal::ShippingAddress(); // var_dump(array($transaction));
$shipping->setRecipientName($array_address_book[0]->Fullname); if($array_address_book[0]->CountryCode == "CA"){
$shipping->setLine1($array_address_book[0]->Address);
$shipping->setCity($array_address_book[0]->City); $shipping = PayPal::ShippingAddress();
$shipping->setCountryCode($array_address_book[0]->CountryCode); $shipping->setRecipientName($array_address_book[0]->Fullname);
$shipping->setPostalCode($array_address_book[0]->ZipCode); $shipping->setLine1($array_address_book[0]->Address);
$shipping->setState($array_address_book[0]->State); $shipping->setCity($array_address_book[0]->City);
$shipping->setPhone($array_address_book[0]->ContactNumber); $shipping->setCountryCode($array_address_book[0]->CountryCode);
$item_list->setShippingAddress($shipping); $shipping->setPostalCode($array_address_book[0]->ZipCode);
$shipping->setState($array_address_book[0]->State);
$shipping->setPhone($array_address_book[0]->ContactNumber);
$item_list->setShippingAddress($shipping);
$payment->setExperienceProfileId($this->createWebProfile());
}
// var_dump($item_list); // var_dump($item_list);
$amount_details = PayPal::Details(); $amount_details = PayPal::Details();
@@ -216,11 +225,8 @@ class PaypalController extends Controller
$redirectUrls->setCancelUrl(route('getCancel')); $redirectUrls->setCancelUrl(route('getCancel'));
// var_dump($shippingAddress) // var_dump($shippingAddress)
$payment = PayPal::Payment();
var_dump(array($transaction));
$payment->setExperienceProfileId($this->createWebProfile());
$payment->setIntent('sale'); $payment->setIntent('sale');
$payment->setPayer($payer); $payment->setPayer($payer);
$payment->setRedirectUrls($redirectUrls); $payment->setRedirectUrls($redirectUrls);
@@ -264,7 +270,11 @@ class PaypalController extends Controller
$m = new TeamStoreModel; $m = new TeamStoreModel;
$UserModel = new UserModel; $UserModel = new UserModel;
$userId = Auth::user()->id; $userId = 0;
if (!Auth::guest()) {
$userId = Auth::user()->id;
}
$items = $m->myCart($cartKey); // item from cart_tmp $items = $m->myCart($cartKey); // item from cart_tmp

17
app/Http/Controllers/teamstore/TeamStoreController.php
View File

@@ -587,13 +587,20 @@ class TeamStoreController extends Controller
$m = new TeamStoreModel; $m = new TeamStoreModel;
$UserModel = new UserModel; $UserModel = new UserModel;
$array_address_book = null;
$userId = Auth::user()->id;
$array_address_book = $UserModel->selectAddresBook('UserId', $userId); if(!Auth::guest()){
if (count($array_address_book) <= 0) { $userId = Auth::user()->id;
$array_address_book = null; $array_address_book = $UserModel->selectAddresBook('UserId', $userId);
if (count($array_address_book) <= 0) {
$array_address_book = null;
}
} }
$cartKey = $request->session()->get('cartkey'); $cartKey = $request->session()->get('cartkey');
$items = $m->myCart($cartKey); $items = $m->myCart($cartKey);
$getSubtotal = $m->getSubtotal($cartKey); $getSubtotal = $m->getSubtotal($cartKey);