diff --git a/app/Http/Controllers/pembayaranController.php b/app/Http/Controllers/pembayaranController.php new file mode 100644 index 00000000..3e875d51 --- /dev/null +++ b/app/Http/Controllers/pembayaranController.php @@ -0,0 +1,36 @@ + array( + // 'order_id' => rand(), + // 'gross_amount' => 10000, + // ), + // 'customer_details' => array( + // 'first_name' => 'nurul prima', + // 'last_name' => 'annisa', + // 'email' => 'npannisa23@example.com', + // 'phone' => '08111222333', + // ), + // ); + + // $snapToken = \Midtrans\Snap::getSnapToken($params); + // return view('user.transaction.pembeli.bayar-transaction', ['snap_token'=>$snapToken]); + // } + // } diff --git a/composer.json b/composer.json index 181dfc70..6f0ba6b4 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,7 @@ "laravel/framework": "^10.10", "laravel/sanctum": "^3.2", "laravel/tinker": "^2.8", + "midtrans/midtrans-php": "^2.5", "realrashid/sweet-alert": "^7.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index aa33680c..b8fab7bc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a47c4c4dd117ce52e4b5d03d7487513b", + "content-hash": "d1d51760d2576a17e3aa9e852fe61200", "packages": [ { "name": "brick/math", @@ -1808,6 +1808,61 @@ ], "time": "2023-08-05T12:09:49+00:00" }, + { + "name": "midtrans/midtrans-php", + "version": "2.5.2", + "source": { + "type": "git", + "url": "https://github.com/Midtrans/midtrans-php.git", + "reference": "a1ad0c824449ca8c68c4cf11b3417ad518311d2b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Midtrans/midtrans-php/zipball/a1ad0c824449ca8c68c4cf11b3417ad518311d2b", + "reference": "a1ad0c824449ca8c68c4cf11b3417ad518311d2b", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "5.7.*", + "psy/psysh": "0.4.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Midtrans\\": "Midtrans/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andri Setiawan", + "email": "andri.setiawan@veritrans.co.id" + }, + { + "name": "Alvin Litani", + "email": "alvin.litani@veritrans.co.id" + }, + { + "name": "Ismail Faruqi", + "email": "ismail.faruqi@veritrans.co.id" + } + ], + "description": "PHP Wrapper for Midtrans Payment API.", + "homepage": "https://midtrans.com", + "support": { + "issues": "https://github.com/Midtrans/midtrans-php/issues", + "source": "https://github.com/Midtrans/midtrans-php/tree/2.5.2" + }, + "time": "2021-08-23T08:52:05+00:00" + }, { "name": "monolog/monolog", "version": "3.4.0", diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 68961532..61dddf00 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -4210,5 +4210,52 @@ body:not(.sidebar-mini) .sidebar-style-2 .sidebar-menu li.active ul.dropdown-men .flex-container { display: flex; - justify-content: space-between; /* Menggeser elemen ke kanan */ + justify-content: space-between; } + +/* CSS untuk gambar profil */ +.card-head{ + /* background-image: linear-gradient(to bottom right, rgb(144, 12, 63) 0%, rgb(186, 39, 96) 100%, rgb(161, 9, 73) 100%); */ + text-align: center; + width: 100%; + background-color: #E6EBEE; + border-radius: 10px 10px 10px 10px ; + color: #393B45; + height: 350px; + font-weight: 800; +} +#card_head { + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 10px 10px 10px 10px ; +} + +.image-crop { + display: block; + position: relative; + background-color: #E6EBEE; + width: 170px; + height: 170px; + margin: 0 auto; + margin-top: -70px; + margin-left: 60px; + overflow: hidden; + border-radius: 50%; + box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5); + border: 3px solid #fff; + background-size: cover; /* Menyesuaikan gambar dengan elemen */ + background-position: center; /* Menengahkan gambar */ + background-repeat: no-repeat; /* Menghindari pengulangan gambar */ +} + + + + + +.row-divider { + margin-bottom: 10px; +} + + + diff --git a/public/assets/images/profilee.jpg b/public/assets/images/profilee.jpg new file mode 100644 index 00000000..daa4a67e Binary files /dev/null and b/public/assets/images/profilee.jpg differ diff --git a/public/assets/images/sampul.jpg b/public/assets/images/sampul.jpg new file mode 100644 index 00000000..9d8ec259 Binary files /dev/null and b/public/assets/images/sampul.jpg differ diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index bf593251..612612d8 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -93,7 +93,7 @@
-
+

INCOME

@@ -104,60 +104,86 @@
- {{--
-
Item List Transaksi(4 Items)
+
+
Item List Transaksi(5 Items)
-
--}} - - + +
+
+
-
+
- +
@@ -178,19 +204,21 @@ - + +
+ {{ $HistoryTransactionPembeli['status'] }}
+ @endforeach @@ -202,6 +230,34 @@ + {{--
+
+
+
+
+
Indonesia
+
Total Populasi: 8,400
+
+
+
+
Palestine
+
Total Populasi: 7,328
+
+
+
+
Syiria
+
Total Populasi: 5,830
+
+
+
+
Malaysia
+
Total Populasi: 4,763
+
+
+
+
--}} + + diff --git a/resources/views/user/layout/main.blade.php b/resources/views/user/layout/main.blade.php index 30699413..3b0ba09b 100644 --- a/resources/views/user/layout/main.blade.php +++ b/resources/views/user/layout/main.blade.php @@ -81,10 +81,7 @@ - - - - + @@ -96,9 +93,9 @@ - - - + + + {{-- Profile --}} + {{-- edit profile --}} + + {{-- sweetalert payment --}} - - + {{-- percobaan midtrans --}} + + diff --git a/resources/views/user/layout/sidebar.blade.php b/resources/views/user/layout/sidebar.blade.php index cc8fd8a9..7c8e9085 100644 --- a/resources/views/user/layout/sidebar.blade.php +++ b/resources/views/user/layout/sidebar.blade.php @@ -13,7 +13,7 @@
  • Starter
    • -
  • +
  • @@ -25,7 +25,7 @@ Penjual
    • - +
  • Pembeli @@ -34,6 +34,7 @@
    • +
  • Manajemen Contact diff --git a/resources/views/user/profile/index.blade.php b/resources/views/user/profile/index.blade.php index 2e5116a4..12eab20d 100644 --- a/resources/views/user/profile/index.blade.php +++ b/resources/views/user/profile/index.blade.php @@ -5,328 +5,69 @@

    Profile

    -
    -
    - -
    - - Profile -

    Nurul Prima Annisa

    -
    @npannisa
    -
    -
    -
    - -
    -
    -
      -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    -
    +
    +
    +
    + +
    +
    + +

    -
    -
    About
    -

    "Saya adalah seorang Frontend Developer dengan lebih dari 3 - pengalaman dalam dunia pengembangan web. - Saya memiliki dedikasi yang kuat untuk menciptakan pengalaman pengguna yang luar - biasa melalui desain web yang menarik dan fungsional. - Pekerjaan saya melibatkan mengubah desain grafis dan konsep menjadi kode HTML, CSS, - dan JavaScript yang dapat diakses oleh pengguna di berbagai perangkat. - Saya memiliki pemahaman mendalam tentang HTML5, CSS3, dan JavaScript serta kerangka - kerja laravel frontend seperti React, Vue.js, atau Angular. - Kemampuan saya dalam memahami desain dan mengimplementasikannya secara responsif - memungkinkan saya untuk menciptakan situs web yang dapat diakses - dengan baik di perangkat seluler, tablet, dan desktop. - Selain itu, saya terbiasa bekerja sama dengan tim pengembang backend untuk - memastikan integrasi yang mulus antara frontend dan backend. - Saya juga senang mempelajari teknologi-teknologi baru dan mengikuti tren terkini - dalam desain web dan pengembangan frontend. - Kemampuan komunikasi dan kolaborasi saya yang baik memungkinkan saya untuk bekerja - sama dengan desainer UX/UI, manajer produk, dan tim lainnya - dalam proyek-proyek pengembangan web. Saya juga percaya bahwa tes dan pemeliharaan - adalah bagian integral dari pengembangan web, sehingga saya - selalu berusaha untuk memastikan kualitas dan keamanan kode saya. - Saya sangat antusias dalam menciptakan pengalaman pengguna yang menarik dan berfokus - pada performa yang baik. Saya siap untuk menghadapi - tantangan baru dalam dunia pengembangan web dan berkontribusi dalam menciptakan - produk-produk yang menginspirasi dan memenuhi kebutuhan pengguna." -

    - -
    Profile Details
    - -
    -
    Full Name
    -
    Nurul Prima Annisa
    +
    +
    +
    +
    +
    + Nurul Prima Annisa
    + @npannisa
    - -
    -
    Company
    -
    Ya apa yak
    -
    - -
    -
    Job
    -
    Frontend Web
    -
    - -
    -
    Country
    -
    Indonesia
    -
    - -
    -
    Address
    -
    Depok city broww
    -
    - -
    -
    Phone
    -
    (+62) 486-3538 29071
    -
    - -
    -
    Email
    -
    npannisa23@gmail.com
    -
    - +
    - -
    - - -
    -
    - -
    - Profile -
    - -
    - +
    +
    +
    +
    - +
    94894893848
    - -
    - -
    - +
    +
    +
    Nurul Prima Annisa
    +
    +
    +
    +
    +
    @npannisa
    +
    +
    +
    +
    +
    Depok City
    - -
    - -
    - +
    +
    +
    +
    +62 1209 0120 02
    - -
    - -
    - +
    +
    +
    +
    npannisa@gmail.com
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - - {{--
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    --}} - -
    - Save Changes -
    - - +
    - -
    - - -
    - -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - -
    - -
    - - -
    - -
    - -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - - -
    -
    -
    +
    +
    + + + @endsection diff --git a/resources/views/user/transaction/Pembeli/bayar-transaction.blade.php b/resources/views/user/transaction/Pembeli/bayar-transaction.blade.php index fc8409e9..4cf53b20 100644 --- a/resources/views/user/transaction/Pembeli/bayar-transaction.blade.php +++ b/resources/views/user/transaction/Pembeli/bayar-transaction.blade.php @@ -30,4 +30,42 @@
    -
    \ No newline at end of file +
    + + {{-- + + --}} + + {{-- --}} + + {{-- + + +
    +
    + + +
    + +
    + + +
    + +
    + + +
    + + + + + + --}} \ No newline at end of file diff --git a/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php b/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php index c05128a5..e5876536 100644 --- a/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php +++ b/resources/views/user/transaction/Pembeli/invoice-transaction.blade.php @@ -117,12 +117,17 @@
    Process Payment + {{-- --}} Cancel
    -
    +
    -@endsection + + + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index f000d41d..79c70f1c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -4,6 +4,8 @@ use App\Models\RefundUser; use App\Models\ContactUser; use App\Models\TransactionPembeli; use App\Models\TransactionPenjual; +use App\Http\Controllers\PembayaranController; +use App\Http\Controllers\ProfileController; use Illuminate\Support\Facades\Route; /* @@ -80,12 +82,6 @@ Route::get('/new-transaction', function () { ]); }); -Route::get('/invoice-transaction', function () { - return view('user/transaction/Pembeli/invoice-transaction',[ - 'name'=>'npannisa', - "TransactionPembeli"=>TransactionPembeli::HistoryTransactionPembeli() - ]); -}); Route::get('/penjual', function () { return view('user/transaction/Penjual/transaction-penjual',[ @@ -94,6 +90,17 @@ Route::get('/penjual', function () { ]); }); +Route::get('/invoice-transaction', function () { + return view('user/transaction/Pembeli/invoice-transaction',[ + 'name'=>'npannisa', + "TransactionPembeli"=>TransactionPembeli::HistoryTransactionPembeli() + ]); +}); + +// percobaan midtrans untuk payment +// Route::get('/bayar-transaction', [pembayaranController::class, 'index']); + + // profile Route::get('/profile', function () { return view('user/profile/index',[ @@ -101,6 +108,15 @@ Route::get('/profile', function () { ]); }); +Route::post('/profile', [ProfileController::class,'updateProfile']); + +// Route::middleware(['web'])->group(function () { + // ... Rute lain di sini ... +// Route::post('/profile', 'ProfileController@updateProfile'); +// }); +Route::get('/profile/edit', [ProfileController::class, 'showEditForm'])->name('profile.edit'); +Route::post('/profile/edit', [ProfileController::class, 'updateProfile']); + // controller // Route::get('/refund/create', 'RefundController@create');
    • {{ $HistoryTransactionPembeli['orderId'] }} {{ $HistoryTransactionPembeli['seller'] }} {{ $HistoryTransactionPembeli['total'] }}{{ $HistoryTransactionPembeli['dueDate'] }}{{ $HistoryTransactionPembeli['dueDate'] }} @php - $statusClass=""; - if ($HistoryTransactionPembeli['status'] === 'OnProgress'){ - $statusClass = 'badge-warning'; - }elseif ($HistoryTransactionPembeli['status'] === 'Success'){ - $statusClass ='btn btn-info'; - }elseif ($HistoryTransactionPembeli['status'] === 'Failed'){ - $statusClass ='badge badge-danger'; + $statusClass = ''; + if ($HistoryTransactionPembeli['status'] === 'OnProgress') { + $statusClass = 'badge-warning'; + } elseif ($HistoryTransactionPembeli['status'] === 'Success') { + $statusClass = 'btn btn-info'; + } elseif ($HistoryTransactionPembeli['status'] === 'Failed') { + $statusClass = 'badge badge-danger'; } @endphp -
    {{ $HistoryTransactionPembeli['status'] }}