Merge branch 'master' of https://github.com/brkcvn/akaunting into new-plans

app/Jobs/Common/CreateDashboard.php

@@ -135,6 +135,8 @@ class CreateDashboard extends Job implements HasOwner, HasSource, ShouldCreate
                     'name' => $name,
                     'sort' => $sort,
                     'settings' => (new $class())->getDefaultSettings(),
+                    'created_from' => $this->model->created_from,
+                    'created_by' => $this->model->created_by,
                 ]));
             }
 

public/css/app.css

@@ -48126,6 +48126,16 @@ input[type="date"]::-webkit-inner-spin-button,
     width: 1px;
 }
 
+.menu__submenu details.relative:before{
+  position: absolute;
+  left: -1rem;
+  height: 100%;
+  --tw-bg-opacity: 1;
+  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
+    content: '';
+    width: 1px;
+}
+
 .menu__submenu li:last-child::before {
     height: 20px;
 }
@@ -48640,6 +48650,12 @@ html[dir="rtl"] .lines-radius-border thead td:last-child {
     }
 }
 
+@media only screen and (min-width: 480px) {
+    .large-overflow-unset {
+        overflow-x: unset;
+    }
+}
+
 #nprogress .bar {
     background: #A6A8C9 !important;
     height: 5px !important;
@@ -49283,6 +49299,10 @@ body{
   right: -0.25rem;
 }
 
+[dir="ltr"] .ltr\:-right-8{
+  right: -2rem;
+}
+
 [dir="ltr"] .ltr\:right-0{
   right: 0px;
 }
@@ -49323,10 +49343,6 @@ body{
   left: 2rem;
 }
 
-[dir="ltr"] .ltr\:-right-8{
-  right: -2rem;
-}
-
 [dir="ltr"] .ltr\:-left-8{
   left: -2rem;
 }
@@ -49405,12 +49421,8 @@ body{
   border-bottom-right-radius: 0.5rem;
 }
 
-[dir="ltr"] .ltr\:border-l-8{
+[dir="ltr"] .ltr\:pl-0{
-  border-left-width: 8px;
+  padding-left: 0px;
-}
-
-[dir="ltr"] .ltr\:pr-20{
-  padding-right: 5rem;
 }
 
 [dir="ltr"] .ltr\:pr-6{
@@ -49474,6 +49486,10 @@ body{
   left: -0.25rem;
 }
 
+[dir="rtl"] .rtl\:-left-8{
+  left: -2rem;
+}
+
 [dir="rtl"] .rtl\:left-0{
   left: 0px;
 }
@@ -49514,10 +49530,6 @@ body{
   right: 2rem;
 }
 
-[dir="rtl"] .rtl\:-left-8{
-  left: -2rem;
-}
-
 [dir="rtl"] .rtl\:-right-8{
   right: -2rem;
 }
@@ -49604,12 +49616,17 @@ body{
   border-bottom-left-radius: 0.5rem;
 }
 
+<<<<<<< HEAD
 [dir="rtl"] .rtl\:border-r-8{
   border-right-width: 8px;
 }
 
 [dir="rtl"] .rtl\:pl-20{
   padding-left: 5rem;
+=======
+[dir="rtl"] .rtl\:pr-0{
+  padding-right: 0px;
+>>>>>>> 98c49461ea80372a4fc20a92ccdb7fe31a06cd5e
 }
 
 [dir="rtl"] .rtl\:pl-6{
@@ -49620,10 +49637,6 @@ body{
   padding-left: 0px;
 }
 
-[dir="rtl"] .rtl\:pr-0{
-  padding-right: 0px;
-}
-
 [dir="rtl"] .rtl\:pr-3{
   padding-right: 0.75rem;
 }
@@ -49899,9 +49912,9 @@ body{
     grid-column: span 5 / span 5;
   }
 
-  .lg\:my-16{
+  .lg\:my-12{
-    margin-top: 4rem;
+    margin-top: 3rem;
-    margin-bottom: 4rem;
+    margin-bottom: 3rem;
   }
 
   .lg\:my-0{
@@ -49913,6 +49926,10 @@ body{
     margin-top: 0.5rem;
   }
 
+  .lg\:mt-4{
+    margin-top: 1rem;
+  }
+
   .lg\:mt-60{
     margin-top: 15rem;
   }
@@ -50188,6 +50205,10 @@ body{
     padding-left: 6rem;
   }
 
+  .lg\:pl-6{
+    padding-left: 1.5rem;
+  }
+
   .lg\:pl-12{
     padding-left: 3rem;
   }
@@ -50252,8 +50273,8 @@ body{
     right: 0px;
   }
 
-  [dir="ltr"] .lg\:ltr\:ml-72{
+  [dir="ltr"] .ltr\:lg\:pl-6{
-    margin-left: 18rem;
+    padding-left: 1.5rem;
   }
 
   [dir="ltr"] .lg\:ltr\:pr-12{
@@ -50276,8 +50297,8 @@ body{
     left: 0px;
   }
 
-  [dir="rtl"] .lg\:rtl\:mr-72{
+  [dir="rtl"] .rtl\:lg\:pr-6{
-    margin-right: 18rem;
+    padding-right: 1.5rem;
   }
 
   [dir="rtl"] .lg\:rtl\:pl-12{

resources/assets/js/components/CreditCard/Card.vue

@@ -12,22 +12,17 @@
         ref="focusElement"
       ></div>
       <div class="absolute w-full h-full bg-black left-0 top-0 rounded-lg overflow-hidden" style="background-image: linear-gradient(147deg, #354fce 0%, #0c296b 74%);">
-        <img
-          v-if="currentCardBackground"
-          :src="currentCardBackground"
-          class="w-full h-full block object-cover"
-        />
       </div>
       <div class="relative h-full py-6 px-4 select-none">
         <div class="flex items-start justify-between px-4">
           <img
-            src="https://raw.githubusercontent.com/muhammederdem/credit-card-form/master/src/assets/images/chip.png"
+            :src="chip_src"
             class="w-12"
           />
           <div class="relative w-full h-12 flex flex-end">
             <transition name="slide-fade-up">
               <img
-                :src="'https://raw.githubusercontent.com/muhammederdem/credit-card-form/master/src/assets/images/' + cardType + '.png'"
+                :src="card_type_src + cardType + '.png'"
                 v-if="cardType"
                 :key="cardType"
                 alt
@@ -94,11 +89,6 @@
     </div>
     <div class="card-item__side -back absolute top-0 left-0 w-full p-0 h-full">
       <div class="absolute w-full h-full bg-black left-0 top-0 rounded-lg overflow-hidden" style="background-image: linear-gradient(147deg, #354fce 0%, #0c296b 74%);">
-        <img
-          v-if="currentCardBackground"
-          :src="currentCardBackground"
-          class="w-full h-full block object-cover"
-        />
       </div>
       <div class="absolute w-full h-32 mt-12 bg-black"></div>
       <div class="relative p-4 text-right">
@@ -108,9 +98,9 @@
         </div>
         <div class="relative w-24 h-12 flex justify-end">
           <img
-            :src="'https://raw.githubusercontent.com/muhammederdem/credit-card-form/master/src/assets/images/' + cardType + '.png'"
+            :src="card_type_src + cardType + '.png'"
             v-if="cardType"
-            class="w-full h-full object-right-top	object-contain"
+            class="w-full h-full object-right-top object-contain"
           />
         </div>
       </div>
@@ -140,7 +130,9 @@ export default {
       amexCardPlaceholder: '#### ###### #####',
       dinersCardPlaceholder: '#### ###### ####',
       defaultCardPlaceholder: '#### #### #### ####',
-      currentPlaceholder: ''
+      currentPlaceholder: '',
+      chip_src: app_url + '/public/img/credit_card/chip.png',
+      card_type_src: app_url + '/public/img/credit_card/',
     }
   },
   watch: {

resources/assets/sass/app.css

@@ -220,6 +220,12 @@
     width: 1px;
 }
 
+.menu__submenu details.relative:before {
+    @apply h-full absolute bg-gray-200 -left-4;
+    content: '';
+    width: 1px;
+}
+
 .menu__submenu li:last-child::before {
     height: 20px;
 }
@@ -548,6 +554,12 @@ html[dir="rtl"] .lines-radius-border thead td:last-child {
     }
 }
 
+@media only screen and (min-width: 480px) {
+    .large-overflow-unset {
+        overflow-x: unset;
+    }
+}
+
 #nprogress .bar {
     background: #A6A8C9 !important;
     height: 5px !important;

resources/views/components/documents/form/items.blade.php

@@ -1,4 +1,4 @@
-<div class="relative sm:col-span-6">
+<div class="relative sm:col-span-6 overflow-x-scroll large-overflow-unset">
     <div style="table-layout: fixed;">
         <div class="overflow-x-visible overflow-y-hidden">
             <table class="small-table-width" id="items">

resources/views/components/documents/template/classic.blade.php

@@ -221,7 +221,7 @@
                             </span>
 
                             <span class="float-right spacing">
-                                @money($total->amount - $document->paid, $document->currency_code, true)
+                                <x-money :amount="$total->amount - $document->paid" :currency="$document->currency_code" convert />
                             </span>
                         </p>
                     @endif
@@ -338,7 +338,7 @@
                         </strong>
 
                         <span>
-                            @money($total->amount, $document->currency_code, true)
+                            <x-money :amount="$total->amount" :currency="$document->currency_code" convert />
                         </span>
                     </div>
                     @stack($total->code . '_total_tr_end')
@@ -351,7 +351,7 @@
                             </span>
 
                             <span>
-                                - @money($document->paid, $document->currency_code, true)
+                                - <x-money :amount="$document->paid" :currency="$document->currency_code" convert />
                             </span>
                         </div>
                         @stack('paid_total_tr_end')
@@ -364,7 +364,7 @@
                         </span>
 
                         <span>
-                            @money($document->amount_due, $document->currency_code, true)
+                            <x-money :amount="$document->amount_due" :currency="$document->currency_code" convert />
                         </span>
                     </div>
                     @stack('grand_total_tr_end')

resources/views/components/documents/template/default.blade.php

@@ -307,7 +307,7 @@
                         </span>
 
                         <span>
-                            @money($total->amount, $document->currency_code, true)
+                            <x-money :amount="$total->amount" :currency="$document->currency_code" convert />
                         </span>
                     </div>
                     @stack($total->code . '_total_tr_end')
@@ -320,7 +320,7 @@
                             </span>
 
                             <span>
-                                - @money($document->paid, $document->currency_code, true)
+                                - <x-money :amount="$document->paid" :currency="$document->currency_code" convert />
                             </span>
                         </div>
                         @stack('paid_total_tr_end')
@@ -333,7 +333,7 @@
                         </span>
 
                         <span>
-                            @money($document->amount_due, $document->currency_code, true)
+                            <x-money :amount="$document->amount_due" :currency="$document->currency_code" convert />
                         </span>
                     </div>
                     @stack('grand_total_tr_end')

resources/views/components/documents/template/line-item.blade.php

@@ -22,13 +22,17 @@
 
     @stack('quantity_td_start')
         @if (! $hideQuantity)
-            <td class="quantity text text-alignment-right text-right">{{ $item->quantity }}</td>
+            <td class="quantity text text-alignment-right text-right">
+                {{ $item->quantity }}
+            </td>
         @endif
     @stack('quantity_td_end')
 
     @stack('price_td_start')
         @if (! $hidePrice)
-            <td class="price text text-alignment-right text-right">@money($item->price, $document->currency_code, true)</td>
+            <td class="price text text-alignment-right text-right">
+                <x-money :amount="$item->price" :currency="$document->currency_code" convert />
+            </td>
         @endif
     @stack('price_td_end')
 
@@ -54,7 +58,9 @@
                         {{ $text_discount }}
                     </td>
                 @else
-                    <td class="discount text text-alignment-right text-right">@money($item->discount, $document->currency_code, true)</td>
+                    <td class="discount text text-alignment-right text-right">
+                        <x-money :amount="$item->discount" :currency="$document->currency_code" convert />
+                    </td>
                 @endif
             @stack('discount_td_end')
         @endif
@@ -62,7 +68,9 @@
 
     @stack('total_td_start')
         @if (! $hideAmount)
-            <td class="total text text-alignment-right text-right">@money($item->total, $document->currency_code, true)</td>
+            <td class="total text text-alignment-right text-right">
+                <x-money :amount="$item->total" :currency="$document->currency_code" convert />
+            </td>
         @endif
     @stack('total_td_end')
 </tr>

resources/views/components/documents/template/modern.blade.php

@@ -308,7 +308,7 @@
                         </span>
 
                         <span>
-                            @money($total->amount, $document->currency_code, true)
+                            <x-money :amount="$total->amount" :currency="$document->currency_code" convert />
                         </span>
                     </div>
                     @stack($total->code . '_total_tr_end')
@@ -321,7 +321,7 @@
                             </span>
 
                             <span>
-                                - @money($document->paid, $document->currency_code, true)
+                                - <x-money :amount="$document->paid" :currency="$document->currency_code" convert />
                             </span>
                         </div>
                         @stack('paid_total_tr_end')
@@ -334,7 +334,7 @@
                             </span>
 
                             <span>
-                                @money($document->amount_due, $document->currency_code, true)
+                                <x-money :amount="$document->amount_due" :currency="$document->currency_code" convert />
                             </span>
                         </div>
                     @stack('grand_total_tr_end')

resources/views/components/transactions/template/default.blade.php

@@ -347,12 +347,12 @@
 
                         <td class="price text-alignment-right text-right" style="color:#424242; font-size:12px; padding-right:0;">
                             @if (! $hideRelatedDocumentAmount)
-                                @money($transaction->document->amount, $transaction->document->currency_code, true) <br />
+                                <x-money :amount="$transaction->document->amount" :currency="$transaction->document->currency_code" convert /> <br />
                             @endif
 
                             @if (! $hideRelatedAmount)
                                 <span style="color: #6E6E6E">
-                                    @money($transaction->amount, $transaction->currency_code, true)
+                                    <x-money :amount="$transaction->amount" :currency="$transaction->currency_code" convert />
                                 </span>
                             @endif
                         </td>
@@ -369,8 +369,10 @@
                     <table>
                         <tr>
                             <td valign="center" style="font-size: 14px; color: #ffffff; padding: 0;">
-                                <span class="ml-2 font-semibold">{{ trans($textAmount) }}</span>
+                                <span class="ml-2 font-semibold">
-                                @money($transaction->amount, $transaction->currency_code, true)
+                                    {{ trans($textAmount) }}
+                                </span>
+                                <x-money :amount="$transaction->amount" :currency="$transaction->currency_code" convert />
                             </td>
                         </tr>
                     </table>

safelist.txt

@@ -3,12 +3,13 @@ lg:mt-2
 ltr:-right-1.5
 rtl:-left-1.5
 lg:pl-24
+lg:my-12
+lg:mt-4
+lg:pl-6
 lg:text-6xl
 lg:h-6
 lg:text-xl
 lg:grid-cols-2
-ltr:pr-20
-rtl:pl-20
 lg:grid-cols-3
 lg:my-16
 lg:h-98
@@ -20,6 +21,8 @@ lg:text-4xl
 lg:top-7
 ltr:border-l-8
 rtl:border-r-8
+ltr:pr-20
+rtl:pl-20
 lg:max-w-lg
 sm:max-w-4xl
 hover:bg-silver-700
@@ -31,4 +34,10 @@ hover:border-peach_orange-700
 hover:border-pastel_green-700
 hover:text-silver-700
 hover:text-peach_orange-700
-hover:text-pastel_green-700
+hover:text-pastel_green-700
+ltr:pl-0
+rtl:pr-0
+ltr:lg:pl-6
+rtl:lg:pr-6
+ltr:-right-8
+rtl:-left-8