Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 75b1036d

Von Werner Hahn vor mehr als 6 Jahren hinzugefügt

  • ID 75b1036d62695266c3670a2dfd4370c2265549fb
  • Vorgänger d6de8b23
  • Nachfolger 50dba889

Shopmodul: ShopPart: Artikel hochladen und Anzeigen

Webshop:: ShopPart

Webshop:: ShopPart

WebShop: ShopPart - Formatierungen ShopPart
Meldung bei Bildern wenn der Artikel noch keinem Shop zugeordnet ist

Conflicts:
templates/webpages/ic/tabs/_shop.html

Webshop: ShopPart Backgroundjob Upload

Conflicts:
SL/BackgroundJob/ShopPartMassUpload.pm
SL/ShopConnector/Shopware.pm
menus/user/10-shopimport.yaml
templates/webpages/shop_part/_list_articles.html
templates/webpages/shop_part/_transfer_status.html
templates/webpages/shop_part/_upload_status.html

Webshop: ShopPart - Webpart Filter nach Anbauer und Shop Anfang

Conflicts:
SL/Controller/ShopPart.pm

Webshop: ShopPart Menu

Conflicts:
menus/user/10-shopimport.yaml

Webshop: ShopPart

Webshop: ShopPart - Mergefehler in templates/webpages/ic/tabs/_shop.html

Conflicts:
templates/webpages/ic/tabs/_shop.html

Webshop: ShopPart

Conflicts:
templates/webpages/shop_part/_filter.html

WebShop: ShopPart - Unterschiedliche Uploadmöglichkeiten (Alles, Nur Preis, Nur Bestand, Bestand und Preis)

Conflicts:
menus/user/10-shopimport.yaml

Conflicts:
SL/Controller/ShopPart.pm
SL/ShopConnector/Shopware.pm
templates/webpages/shop_part/_list_articles.html

WebShop: ShopPart - Shopartikelliste Aktiv grafik

Conflicts:
SL/Controller/ShopPart.pm
SL/ShopConnector/Shopware.pm
js/kivi.shop_part.js
t/background_job/known_jobs.t

Conflicts:
SL/Controller/ShopPart.pm
SL/DB/ShopPart.pm
templates/webpages/ic/tabs/_shop.html

Unterschiede anzeigen:

templates/webpages/ic/tabs/_shop.html
18 18
   <th>[% LxERP.t8("Action") %]</th>
19 19
  </tr>
20 20
  </thead>
21

  
21 22
  [%- FOREACH shop_part = SHOP_PARTS %]
22 23
  <tr class="listrow">
23 24
   <td>[% HTML.escape( shop_part.shop.description ) %]</td>
......
44 45
   <td></td>
45 46
   <td></td>
46 47
   <td></td>
48
   <td></td>
49
   <td></td>
50
   <td></td>
47 51
   <td>[% L.button_tag("kivi.shop_part.create_shop_part(" _ id _ ", " _ shop.id _ ")", LxERP.t8("Add"))  %]</td>
48 52
   <td></td>
49 53
  </tr>
......
73 77
   </p>
74 78
  </div>
75 79
  [%- END %]
76
  <script type="text/javascript">
77
    $(function() {
78
      kivi.shop_part.show_images([% shop_part.part_id %]);
79
    });
80
  </script>
81
  <div id="shop_images" border=1 >
82
  </div>
83

  
84
<div id="shop_variables">
85
[% LxERP.t8("Active shops:") %]
86
 <table>
87
  <thead>
88
  <tr>
89
   <th>[% LxERP.t8("Shop") %]</th>
90
   <th>[% LxERP.t8("Active") %]</th>
91
   <th>[% LxERP.t8("Shop part") %]</th>
92
   <th>[% LxERP.t8("Last update") %]</th>
93
   <th>[% LxERP.t8("Action") %]</th>
94
   <th>[% LxERP.t8("Action") %]</th>
95
  </tr>
96
  </thead>
97
  [%- FOREACH shop_part = SHOP_PARTS %]
98
  <tr>
99
   <td>[% HTML.escape( shop_part.shop.description ) %]</td>
100
   <td>[% L.html_tag('span', shop_part.active, id => 'shop_part_active_' _ shop_part.id ) %]</td>
101
   <td>[% L.html_tag('span', shop_part.shop_description, id => 'shop_part_description_' _ shop_part.id ) %]</td>
102
   <td>[% L.html_tag('span', shop_part.last_update.to_kivitendo('precision' => 'minute'), id => 'shop_part_last_update_' _ shop_part.id ) %]</td>
103
   <td>[% L.button_tag("kivi.shop_part.edit_shop_part(" _ shop_part.id _ ")", LxERP.t8("Edit"))  %]</td>
104
   <td>[% L.button_tag("kivi.shop_part.update_shop_part(" _ shop_part.id _ ")", LxERP.t8("Update"))  %]</td>
105
   <td>[% L.button_tag("kivi.shop_part.get_all_categories(" _ shop_part.id _ ")", LxERP.t8("Shopcategories"))  %]</td>
106
  </tr>
107
  [%- END %]
108
  [%- FOREACH shop = SHOPS_NOT_ASSIGNED %]
109
  <tr>
110
   <td>[% HTML.escape( shop.description ) %]</td>
111
   <td></td>
112
   <td></td>
113
   <td></td>
114
   <td>[% L.button_tag("kivi.shop_part.create_shop_part(" _ id _ ", " _ shop.id _ ")", LxERP.t8("Add"))  %]</td>
115
   <td></td>
116
  </tr>
117
  [%- END %]
118
</table>
119

  
120

  
121
[% # L.dump(shop_part) %]
122
<hr>
123
  [%- IF CUSTOM_VARIABLES.size %]
124
  <div id="shop_custom_variables">
125
   <p>
126
    <table>
127
     [%- FOREACH var = CUSTOM_VARIABLES %]
128
      [%- IF var.name.match('^shop_') %]
129
       <tr>
130
        [%- IF !var.partsgroup_filtered %]
131
          <td align="right" valign="top">[% HTML.escape(var.description) %]</td>
132
        [%- END %]
133
        <td valign="top">[% var.HTML_CODE %]</td>
134
       </tr>
135
      [%- END %]
136
     [%- END %]
137
    </table>
138
   </p>
139
  </div>
80
  [%- IF shop_part.part_id %]
81
    <script type="text/javascript">
82
      $(function() {
83
        kivi.shop_part.show_images([% shop_part.part_id %]);
84
      });
85
    </script>
86
    <div id="shop_images" border=1 ></div>
87
  [%- ELSE %]
88
    <div id="shop_images" border=1 >[% LxERP.t8('To upload images: Please create shoppart first') %]</div>
140 89
  [%- END %]
141
  <script type="text/javascript">
142
    function show_images() {
143
      var url = 'controller.pl?action=ShopPart/show_files&modul=shop_part&id=[% shop_part.part_id %]';
144
      $('#shop_images').load(url);
145
    }
146

  
147
$(window).load(function() {
148
        show_images();
149
});
150
  </script>
151
  <div id="shop_images" border=1 >
152
  </div>
153 90
</div>
154 91

  

Auch abrufbar als: Unified diff