diff --git a/CS/components/base/pesanan_belum_lunas_detail.html b/CS/components/base/pesanan_belum_lunas_detail.html
index 74752f2..a91a399 100644
--- a/CS/components/base/pesanan_belum_lunas_detail.html
+++ b/CS/components/base/pesanan_belum_lunas_detail.html
@@ -333,6 +333,22 @@ <h3 name="no_pesanan" class="header-pesanan-no">
 													<input name="tanggal_pesanan" class="form-control m-input" type="text" value="20-11-2018" id="example-text-input" disabled="true">
 												</div>
 											</div>
+											<div class="form-group m-form__group row">
+												<label for="example-text-input" class="col-2 col-form-label">
+													Tanggal Selesai
+												</label>
+												<div class="col-4">
+													<input name="tanggal_pesanan_selesai" class="form-control m-input" type="text" value="21-11-2018" id="example-text-input" disabled="true">
+												</div>
+											</div>
+											<div class="form-group m-form__group row">
+												<label for="example-text-input" class="col-2 col-form-label">
+													Tipe Pembayaran
+												</label>
+												<div class="col-4">
+													<input name="tipe_pembayaran" class="form-control m-input" type="text" value="Transfer" id="example-text-input" disabled="true">
+												</div>
+											</div>
 										    <div class="form-group m-form__group row">
 												<label for="example-text-input" class="col-2 col-form-label">
 													Order Status : 
@@ -346,7 +362,7 @@ <h3 name="no_pesanan" class="header-pesanan-no">
 											<div class="m-portlet__body">
 												<!--begin: Datatable -->
 												<!-- <div class="m_datatable" id="local_data"></div> -->
-												<table class="table" id="tbl_invoice_bl_Lunas">
+												<table class="table table-view" id="tbl_invoice_bl_Lunas">
 													<thead>
 														<tr>
 															<th>No</th>
diff --git a/CS/components/base/pesanan_saya.html b/CS/components/base/pesanan_saya.html
index 9ae7d12..4c5948a 100644
--- a/CS/components/base/pesanan_saya.html
+++ b/CS/components/base/pesanan_saya.html
@@ -288,47 +288,119 @@ <h3 class="m-subheader__title m-subheader__title--separator">
 					<div class="m-content">
 						<div class="row">
 							<div class="col-xl-6">
-								<div class="m-portlet m-portlet--bordered-semi m-portlet--half-height m-portlet--fit " style="height: 210px">
-									<div class="m-portlet__head colorized-header-yellow">
-										<div class="m-portlet__head-caption ">
-											<div  class="m-portlet__head-title">
-												<h3 style="color: white; width: 90vw; text-align: center;" class="m-portlet__head-text">
-													Jumlah Pesanan Down Payment
+								<div class="m-portlet m--bg-accent-kuning m-portlet--bordered-semi m-portlet--skin-dark m-portlet--full-height ">
+									<div class="m-portlet__head">
+										<div class="m-portlet__head-caption">
+											<div class="m-portlet__head-title">
+												<h3 style="font-size: 1.7rem" class="m-portlet__head-text">
+													Pesanan Down Payment
 												</h3>
 											</div>
 										</div>
 									</div>
 									<div class="m-portlet__body">
-										<div align="Center" class=" m-font-karyawan" style="font-size: 4rem; color:#21212; font-weight: 500;">
-											<span id="jumlah_down_payment"> 7 </span>	 
+										<div align="left" style="display:inline-block" class="col-6">
+											<span>
+												<i style="font-size: 4.4rem; color: rgba(0,0,0,.2);" class="flaticon-download"></i>
+											</span>
 										</div>
-										<div align="center" class="pemasukan_hari_ini" style="font-size: 1.5rem; color:#21212; font-weight: 500;">
-												<span id="total_down_payment"> Rp. 420.000 </span>	 
+										<div style="display:inline-block" align="right"  class=" m-widget7 m-widget7--skin-dark">
+											<span  id="pesanan_down_payment" class="item-font">102</span> Pesanan <br>
+											<span id="total_pesanan_down_payment" class="item-font-jumlah">Rp420.000</span>
 										</div>
 									</div>
 								</div>
 							</div>
 							<div class="col-xl-6">
-								<div class="m-portlet m-portlet--bordered-semi m-portlet--half-height m-portlet--fit " style="height: 210px">
-									<div class="m-portlet__head colorized-header-green">
-										<div class="m-portlet__head-caption ">
+								<div class="m-portlet m--bg-accent-hijau m-portlet--bordered-semi m-portlet--skin-dark m-portlet--full-height ">
+									<div class="m-portlet__head">
+										<div class="m-portlet__head-caption">
+											<div class="m-portlet__head-title">
+												<h3 style="font-size: 1.7rem" class="m-portlet__head-text">
+													Pesanan Lunas
+												</h3>
+											</div>
+										</div>
+									</div>
+									<div class="m-portlet__body">
+										<div align="left" style="display:inline-block" class="col-6">
+											<span>
+												<i style="font-size: 4.4rem; color: rgba(0,0,0,.2);" class="fa fa-check"></i>
+											</span>
+										</div>
+										<div style="display:inline-block" align="right"  class=" m-widget7 m-widget7--skin-dark">
+											<span  id="pesanan_luas" class="item-font">139</span> Pesanan <br>
+											<span id="total_pesanan_lunas" class="item-font-jumlah">Rp8.340.000</span>
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="col-xl-4">
+								<div class="m-portlet m--bg-accent-merah m-portlet--bordered-semi m-portlet--skin-dark m-portlet--full-height ">
+									<div class="m-portlet__head">
+										<div class="m-portlet__head-caption">
+											<div class="m-portlet__head-title">
+												<h3 style="font-size: 1.7rem" class="m-portlet__head-text">
+													Cash
+												</h3>
+											</div>
+										</div>
+									</div>
+									<div class="m-portlet__body">
+										<div align="left" style="display:inline-block" class="col-6">
+											<img style="width: auto; height: 55px;" src="../../../assets/demo/default/media/img/misc/icon_cash.png">
+										</div>
+										<div style="display:inline-block" align="right"  class=" m-widget7 m-widget7--skin-dark">
+											<span  id="pesanan_cash" class="item-font-kecil">89</span> Pesanan <br>
+											<span id="total_pesanan_cash" class="item-font-jumlah-kecil">Rp2.040.000</span>
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="col-xl-4">
+								<div class="m-portlet m--bg-accent-biru m-portlet--bordered-semi m-portlet--skin-dark m-portlet--full-height ">
+									<div class="m-portlet__head">
+										<div class="m-portlet__head-caption">
 											<div class="m-portlet__head-title">
-												<h3  style="color: white; width: 90vw; text-align: center;" class="m-portlet__head-text">
-													Jumlah Pesanan Lunas
+												<h3 style="font-size: 1.7rem" class="m-portlet__head-text">
+													EDC
 												</h3>
 											</div>
 										</div>
 									</div>
 									<div class="m-portlet__body">
-										<div align="Center" class=" m-font-karyawan" style="font-size: 4rem; color:#21212; font-weight: 500;">
-												<span id="jumlah_pesanan_lunas"> 139 </span>
+										<div align="left" style="display:inline-block" class="col-6">
+											<img style="width: auto; height: 55px;" src="../../../assets/demo/default/media/img/misc/icon_edc.png">
 										</div>
-										<div align="center" class="pemasukan_total_saya" style="font-size: 1.5rem; color:#21212; font-weight: 500;">
-												<span id="total_pesanan_lunas">Rp. 8.340.000</span> 
+										<div style="display:inline-block" align="right"  class=" m-widget7 m-widget7--skin-dark">
+											<span  id="pesanan_edc" class="item-font-kecil">89</span> Pesanan <br>
+											<span id="total_pesanan_edc" class="item-font-jumlah-kecil">Rp2.040.000</span>
 										</div>
 									</div>
 								</div>
-							</div> 
+							</div>
+							<div class="col-xl-4">
+								<div class="m-portlet m--bg-accent-ungu m-portlet--bordered-semi m-portlet--skin-dark m-portlet--full-height ">
+									<div class="m-portlet__head">
+										<div class="m-portlet__head-caption">
+											<div class="m-portlet__head-title">
+												<h3 style="font-size: 1.7rem" class="m-portlet__head-text">
+													Transfer
+												</h3>
+											</div>
+										</div>
+									</div>
+									<div class="m-portlet__body">
+										<div align="left" style="display:inline-block" class="col-6">
+											<img style="width: auto; height: 55px;" src="../../../assets/demo/default/media/img/misc/icon_transfer.png">
+										</div>
+										<div style="display:inline-block" align="right"  class=" m-widget7 m-widget7--skin-dark">
+											<span  id="pesanan_transfer" class="item-font-kecil">89</span> Pesanan <br>
+											<span id="total_pesanan_transfer" class="item-font-jumlah-kecil">Rp2.040.000</span>
+										</div>
+									</div>
+								</div>
+							</div>
 						</div>
 						<div class="m-portlet m-portlet--mobile">
 							<div class="m-portlet__body">
diff --git a/CS/index.html b/CS/index.html
index f878fe2..99e3d7a 100644
--- a/CS/index.html
+++ b/CS/index.html
@@ -153,7 +153,6 @@
 									</span>
 								</a>
 							</li>
-							
 							<!-- PESANAN -->
 							<li class="m-menu__item m-menu__item--submenu" aria-haspopup="true" data-menu-submenu-toggle="hover">
 								<a href="#" class="m-menu__link m-menu__toggle">
diff --git a/assets/demo/default/base/pelangi-style.css b/assets/demo/default/base/pelangi-style.css
index 6e659df..8d43e89 100644
--- a/assets/demo/default/base/pelangi-style.css
+++ b/assets/demo/default/base/pelangi-style.css
@@ -391,3 +391,43 @@ float: right;
 #btn_selesai_desain {
     border-radius : 20px;
 }
+
+.m-datatable__table {
+    min-height: 0 !important;
+}
+
+.item-font {
+    font-size: 4rem;
+    font-weight : 500;
+}
+
+.item-font-kecil {
+    font-size: 2.3rem;
+    font-weight : 500;
+}
+
+.item-font-jumlah {
+    font-size: 2rem;
+    font-weight : 500;
+}
+
+.item-font-jumlah-kecil {
+    font-size: 1.3rem;
+    font-weight : 500;
+}
+
+.m--bg-accent-hijau {
+    background-color: #18bb28 !important;
+}
+.m--bg-accent-merah {
+    background-color: #bb183e !important;
+}
+.m--bg-accent-kuning {
+    background-color: #eaad21 !important;
+}
+.m--bg-accent-biru {
+    background-color: #21b2ea !important;
+}
+.m--bg-accent-ungu {
+    background-color: #924388 !important;
+}
diff --git a/assets/demo/default/media/img/misc/icon_cash.png b/assets/demo/default/media/img/misc/icon_cash.png
new file mode 100644
index 0000000..b6fe886
Binary files /dev/null and b/assets/demo/default/media/img/misc/icon_cash.png differ
diff --git a/assets/demo/default/media/img/misc/icon_edc.png b/assets/demo/default/media/img/misc/icon_edc.png
new file mode 100644
index 0000000..efc53fc
Binary files /dev/null and b/assets/demo/default/media/img/misc/icon_edc.png differ
diff --git a/assets/demo/default/media/img/misc/icon_transfer.png b/assets/demo/default/media/img/misc/icon_transfer.png
new file mode 100644
index 0000000..d6eda0b
Binary files /dev/null and b/assets/demo/default/media/img/misc/icon_transfer.png differ