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

added store password

Browse Source
This commit is contained in:
franknstayn
2021-07-19 20:49:11 +08:00
parent 89a94bd0ca
commit 145ea90974
4 changed files with 103 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ class PaypalController extends Controller
// $order_subtotal = $updated_getSubtotal[0]->Subtotal;
$order_grandtotal = $updated_getSubtotal[0]->Subtotal;
if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185) {
if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244) {
$tax_value = 0;
} else {
$tax_value = 0.10;

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

@@ -14,6 +14,7 @@ use App\Models\user\UserModel;
use Illuminate\Support\Facades\Mail;
use Analytics;
use App\Models\TemplatesModel;
use Illuminate\Support\Facades\Session;
class TeamStoreController extends Controller
{
@@ -40,7 +41,7 @@ class TeamStoreController extends Controller
if ($store_array[0]->Password != null) {
if ($request->session()->get('teamstore_data_array') == null) {
if ($store_id != $store_array[0]->Id) {
return redirect('teamstore');
return redirect('/');
}
} else {
@@ -175,9 +176,16 @@ class TeamStoreController extends Controller
if ($store_array) {
$request->session()->put('teamstore_data_array', $store_array);
return redirect('teamstore/' . $store_array[0]->StoreUrl);
return redirect('store/' . $store_array[0]->StoreUrl);
} else {
return redirect()->back()->with('errors', 'Invalid Password.');
Session::flash('errors', 'Invalid Password');
echo '<script>
alert("Invalid Password");
window.history.back();
</script>';
// return redirect('cart');
// return redirect('/');
}
}