Commit 1b3ac39e authored by mehdi's avatar mehdi

Merge branch 'release/v1.0.0'

parents f5559955 b2377fe5
......@@ -14,23 +14,40 @@ body {
font-family: "Samim-FD";
}
/*#main-container {*/
/* height: 100%;*/
/*}*/
/*.wrapper {*/
/* height: 100%;*/
/*}*/
a {
color: rgb(0, 123, 255);
background-color: transparent;
text-decoration: none !important;
}
aside {
min-width: 200px;
}
/*aside.col-12 {*/
/* height: 50px;*/
/*}*/
.bg-grey {
background-color: #f9fafb !important;
}
.content-header {
padding: 15px 0.5rem;
}
.content-header h1 {
font-size: 1.8rem;
margin: 0px;
}
.content-header .breadcrumb {
line-height: 1.8rem;
margin-bottom: 0px;
background: 0px 0px;
padding: 0px;
}
.content {
padding: 0 0.5rem;
}
@media screen and (min-width: 768px) {
aside {
......@@ -46,9 +63,35 @@ tr.clickable-row:hover {
cursor: pointer;
}
.table > tbody > tr > td {
vertical-align: middle;
}
.card {
box-shadow: 0 0 1px rgba(0, 0, 0, .125), 0 1px 3px rgba(0, 0, 0, .2);
margin-bottom: 1rem;
}
.card-header {
background-color: transparent;
border-bottom: 1px solid rgba(0, 0, 0, .125);
padding: .75rem 1.25rem;
position: relative;
border-top-left-radius: .25rem;
border-top-right-radius: .25rem;
}
.card-title {
float: right;
font-size: 1.1rem;
font-weight: 400;
margin: 0;
}
.card-body > .table-responsive > .table {
margin-bottom: 0;
}
.card-body.p-0 .table tbody > tr > td:first-of-type, .card-body.p-0 .table tbody > tr > th:first-of-type, .card-body.p-0 .table thead > tr > td:first-of-type, .card-body.p-0 .table thead > tr > th:first-of-type {
padding-right: 1.5rem;
}
\ No newline at end of file
......@@ -2,6 +2,7 @@
{% load jalali_tags %}
{% block title %}مصرف{% endblock %}
{% block breadcrumb-item %}مصرف{% endblock %}
{% block create %}{% url "consumption_create" %}{% endblock %}
......
{% extends "base_list.html" %}
{% block title %}طرف حساب{% endblock %}
{% block breadcrumb-item %}طرف حساب{% endblock %}
{% block create %}{% url "customer_create" %}{% endblock %}
......
This diff is collapsed.
......@@ -2,6 +2,7 @@
{% load jalali_tags %}
{% block title %}حواله{% endblock %}
{% block breadcrumb-item %}حواله{% endblock %}
{% block create %}{% url "draft_create" %}{% endblock %}
......
......@@ -60,7 +60,7 @@
border-bottom: 2px solid black;
}
.table thead tr:first-child th:first-child {
.table thead tr:first-child th {
border-top: 2px solid black;
}
......@@ -77,6 +77,11 @@
height: 1.3cm;
}
.top-header th {
text-align: right;
padding-right: 0.25cm;
}
.freight {
margin: 1cm 0;
......@@ -104,12 +109,16 @@
<table class="table" style="width: 100%">
<thead>
<tr class="top-header">
<th colspan="8">حواله انبار</th>
<th colspan="3"><span>شماره حواله: </span>{{ draft.id }}</th>
<th colspan="3" style="border-right: none"><span>طرف حساب: </span>{{ draft.customer.name }}</th>
<th colspan="2" style="border-right: none;"><span>تاریخ: </span>{{ draft.date|to_jalali:"%Y/%m/%d" }}</th>
</tr>
<tr class="top-header">
<th colspan="3"><span>شماره حواله: </span>{{ draft.id }}</th>
<th colspan="3" style="border-right: none"><span>طرف حساب : </span>{{ draft.customer.name }}</th>
<th colspan="2" style="border-right: none;"><span>تاریخ : </span>{{ draft.date|to_jalali:"%Y/%m/%d" }}</th>
<th colspan="6" style="border-bottom: none"><span>گیرنده: </span>{{ draft.receiver.name }}</th>
<th colspan="6" style="border-bottom: none; border-right: none"><span>شماره تماس: </span>{{ draft.receiver.phone_number }}</th>
</tr>
<tr class="top-header">
<th colspan="12"><span>آدرس: </span>{{ draft.receiver.address }}</th>
</tr>
<tr>
<th>ردیف</th>
......@@ -137,7 +146,7 @@
{% endfor %}
<tr>
<td>مجموع</td>
<td colspan="5">تعداد بسته: {{draft.packages.count}} </td>
<td colspan="5">تعداد بسته: {{ draft.packages.count }} </td>
<td>{{ draft.net_weight }}</td>
<td>{{ draft.gross_weight }}</td>
</tr>
......@@ -151,7 +160,7 @@
<span>{{ draft.freight_number }}</span>
از موسسه حمل و نقل
<span>{{ draft.shipping_company_name }}</span>
تحویل آقای
به آقای
<span>{{ draft.driver_name }}</span>
راننده ی
<span>{{ draft.vehicle_type }}</span>
......@@ -159,12 +168,6 @@
<span>{{ draft.vehicle_number }}</span>
و شماره تماس
<span>{{ draft.driver_phone_number }}</span>
جهت تحویل به آقای
<strong>{{ draft.receiver.name }}</strong>
در آدرس
<strong>{{ draft.receiver.address }}</strong>
به شماره تماس
<strong>{{ draft.receiver.phone_number }}</strong>
تحویل داده شد و هر گونه خسارت بر عهده ی وی می باشد.
</p>
<p style="text-align: left; padding-left: 4cm">امضا راننده:</p>
......
{% extends "base_list.html" %}
{% block title %}فرستنده/گیرنده{% endblock %}
{% block breadcrumb-item %}فرستنده/گیرنده{% endblock %}
{% block create %}{% url "endpoint_create" %}{% endblock %}
......@@ -13,7 +14,7 @@
{% block update %}{% url "endpoint_update" pk=object.pk %}{% endblock %}
{% block rows %}
<td>{{object.name}}</th>
<td>{{object.name}}</td>
<td>{{object.phone_number}}</td>
<td>{{object.address}}</td>
{% endblock %}
\ No newline at end of file
......@@ -2,6 +2,7 @@
{% load jalali_tags %}
{% block title %}انبار گردانی{% endblock %}
{% block breadcrumb-item %}انبار گردانی{% endblock %}
{% block create %}{% url "inventory_adjustment_create" %}{% endblock %}
......
{% extends "base.html" %}
{% block title %}انبار کالا{% endblock %}
{% block breadcrumb-item %}انبار کالا{% endblock %}
{% block content %}
<div class="float-right">
<a class="btn btn-primary mb-3" href={% url "package_list" %}>بسته بندی</a>
......@@ -9,39 +11,44 @@
<a class="btn btn-primary mb-3" href={% url "receipt_list" %}>رسید</a>
<a class="btn btn-primary mb-3" href={% url "inventory_adjustment_list" %}>انبارگردانی</a>
</div>
<table class="table table-sm table-borderless">
<thead>
<tr class="table-primary">
{% block headers %}
<th>کد کالا</th>
<th>نام کالا</th>
<th>ترکیب</th>
<th>نمره</th>
<th>روش تولید</th>
<th>همبافت</th>
<th>رنگ</th>
<th>وزن</th>
{% endblock %}
</tr>
</thead>
{% for object in object_list %}
<tbody>
<tr class="clickable-row" href={% block update %} {% endblock %}>
{% block rows %}
<td>{{ object.id }}</td>
<td>{{ object.name }}</td>
<td>{{ object.combination|default_if_none:"" }}</td>
<td>{{ object.grade|default_if_none:"" }}</td>
<td>{{ object.production_method|default_if_none:"" }}</td>
<td>{{ object.lot|default_if_none:"" }}</td>
<td>{{ object.color|default_if_none:"" }}</td>
<td style="direction: ltr">{{ object.inventory }}</td>
{% endblock %}
</tr>
</tbody>
{% endfor %}
</table>
<div class="card" style="width: 100%">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table">
<thead>
<tr>
{% block headers %}
<th>کد کالا</th>
<th>نام کالا</th>
<th>ترکیب</th>
<th>نمره</th>
<th>روش تولید</th>
<th>همبافت</th>
<th>رنگ</th>
<th>وزن</th>
{% endblock %}
</tr>
</thead>
{% for object in object_list %}
<tbody>
<tr class="clickable-row" href={% block update %} {% endblock %}>
{% block rows %}
<td>{{ object.id }}</td>
<td>{{ object.name }}</td>
<td>{{ object.combination|default_if_none:"" }}</td>
<td>{{ object.grade|default_if_none:"" }}</td>
<td>{{ object.production_method|default_if_none:"" }}</td>
<td>{{ object.lot|default_if_none:"" }}</td>
<td>{{ object.color|default_if_none:"" }}</td>
<td style="direction: ltr">{{ object.inventory }}</td>
{% endblock %}
</tr>
</tbody>
{% endfor %}
</table>
</div>
</div>
</div>
{% endblock %}
......
......@@ -2,6 +2,7 @@
{% load jalali_tags %}
{% block title %}بسته بندی{% endblock %}
{% block breadcrumb-item %}بسته بندی{% endblock %}
{% block create %}{% url "package_create" %}{% endblock %}
......
{% extends "base_list.html" %}
{% block title %}کالا{% endblock %}
{% block breadcrumb-item %}کالا{% endblock %}
{% block create %}{% url "product_create" %}{% endblock %}
......
......@@ -2,6 +2,7 @@
{% load jalali_tags %}
{% block title %}رسید کالا{% endblock %}
{% block breadcrumb-item %}رسید کالا{% endblock %}
{% block create %}{% url "receipt_create" %}{% endblock %}
......
......@@ -18,8 +18,25 @@
<div id="main-container" class="container-fluid">
<div class="row wrapper">
{% include "menu.html" %}
<main class="col bg-faded py-5">
{% block content %} {% endblock %}
<main class="col bg-faded py-5 bg-grey">
<section class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1>{% block title %} {% endblock %}</h1>
</div>
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">خانه</a></li>
<li class="breadcrumb-item active">{% block breadcrumb-item %} {% endblock %}</li>
</ol>
</div>
</div>
</div><!-- /.container-fluid -->
</section>
<section class="content">
<div class="container-fluid">{% block content %} {% endblock %}</div>
</section>
</main>
</div>
</div>
......
......@@ -4,21 +4,25 @@
{% block content %}
<a class="btn btn-primary mb-3 float-right" href={% block create %} {% endblock %}>افزودن</a>
<div class="table-responsive">
<table class="table table-borderless table-sm">
<thead>
<tr class="table-primary">
{% block headers %} {% endblock %}
</tr>
</thead>
{% for object in object_list %}
<tbody>
<tr class="clickable-row" data-href={% block update %} {% endblock %}>
{% block rows %} {% endblock %}
</tr>
</tbody>
{% endfor %}
</table>
<div class="card" style="width: 100%">
<div class="card-body p-0">
<div class="table-responsive">
<table class="table">
<thead>
<tr>
{% block headers %} {% endblock %}
</tr>
</thead>
{% for object in object_list %}
<tbody>
<tr class="clickable-row" data-href={% block update %} {% endblock %}>
{% block rows %} {% endblock %}
</tr>
</tbody>
{% endfor %}
</table>
</div>
</div>
</div>
{% if is_paginated %}
<div class="mt-2">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment