Commit Graph

8412 Commits

Author SHA1 Message Date
devansh bawari 8935fbbf13 Comments Fixed 2021-05-06 16:01:52 +05:30
devansh bawari 225e0636ef Imports Added 2021-05-06 15:56:18 +05:30
devansh bawari e01b991281 Finishing And Refactoring Dog Done 2021-05-06 15:45:56 +05:30
devansh bawari daa829b0b8 Reverted Admin Language 2021-05-06 14:09:48 +05:30
devansh bawari 8d00142e14 Packed Everything In One Package 2021-05-06 14:07:30 +05:30
devansh bawari 24c3317f56 Taxes Configuration Adjusted 2021-05-06 12:38:33 +05:30
devansh bawari 48ced3f866 Merge branch 'master' into tax-enhancement 2021-05-06 10:47:49 +05:30
Glenn Hermans 5f39280d18
Merge pull request #4850 from bagisto-europe/mail-settings
Moved mail settings to correct section
2021-05-06 02:10:30 +02:00
Glenn Hermans 1108e8114b email update 2021-05-05 23:15:56 +02:00
Glenn Hermans 01dc23d705
Moved email settings from general to email 2021-05-05 19:30:53 +02:00
Glenn Hermans eaf9b367c1
Moved email settings in admin panel
Moved email settings from General to Email
2021-05-05 19:25:26 +02:00
Glenn Hermans fe1ee2dcad
Updated notifications translations 2021-05-05 18:31:17 +02:00
Glenn Hermans 0de4819a74
Merge pull request #24 from bagisto/master
Update fork
2021-05-05 18:27:16 +02:00
devansh bawari f4ed91fdbd Translation Added For Velocity Theme 2021-05-05 19:47:43 +05:30
devansh bawari 6941ef230a Translation Added For Default Theme 2021-05-05 19:47:27 +05:30
devansh bawari 328f748cfe Implemented In Default Theme Also 2021-05-05 19:33:30 +05:30
devansh bawari 3a04aa37ac View Portion Handled 2021-05-05 18:36:46 +05:30
devansh bawari abc9d727e8 Price HTML Handled For All Product Types 2021-05-05 18:36:26 +05:30
devansh bawari 6222190c14 Translation Added For Configuration 2021-05-05 18:35:53 +05:30
devansh bawari b6d648ae0c Configuration Added 2021-05-05 18:35:28 +05:30
devansh bawari 18a3e811d7 Tax Inclusive Added For Velocity Theme 2021-05-05 16:53:53 +05:30
Glenn Hermans d69e5a41b0
Merge pull request #4846 from bagisto-europe/labels
admin form label support
2021-05-05 06:12:46 +02:00
Glenn Hermans 8a53abb354
Make labels clickable 2021-05-05 06:01:59 +02:00
Glenn Hermans ad092a0163
Merge pull request #23 from bagisto/master
Update branch
2021-05-05 01:56:19 +02:00
Glenn Hermans 76fa152ba1
Merge pull request #22 from bagisto/master 2021-05-05 01:54:08 +02:00
Glenn Hermans a1ef8e8904
Merge pull request #4845 from devansh-webkul/master
Latest Recompiled UI Package File
2021-05-04 06:16:08 +02:00
devansh bawari e69bbe8cbc Recompiled 2021-05-04 09:33:48 +05:30
Glenn Hermans d7c0e1f66e
Merge pull request #4844 from bagisto-europe/3251
fixed #3251
2021-05-04 05:57:10 +02:00
Glenn Hermans 794c166082 Added invoice states 2021-05-04 05:22:33 +02:00
Glenn Hermans 3a307a8371 fix #3251 2021-05-04 05:00:36 +02:00
Glenn Hermans 777ebd31cc
Merge pull request #21 from bagisto/master
Update fork
2021-05-04 02:03:22 +02:00
Glenn Hermans 446c4384fe
Merge pull request #4841 from rahulcs0082/4840
Issue #4840 fixed
2021-05-03 15:24:06 +02:00
Glenn Hermans 3606c8ce1e
Merge pull request #4839 from rahulcs0082/4557
Issue #4557 done
2021-05-03 13:24:42 +02:00
rahulcs0082 00f8497d2f Issue #4840 fixed 2021-05-03 16:49:18 +05:30
rahulcs0082 ee98ba8525 fixes as per comment 2021-05-03 14:27:08 +05:30
rahulcs0082 aa88f1390d Issue #4557 done 2021-05-03 11:36:17 +05:30
Glenn Hermans 60b40fc478
Merge pull request #4837 from bagisto-europe/shipping
Define a custom order status for shipments
2021-05-03 04:15:57 +02:00
Glenn Hermans 899d70483d
Added missing space 2021-05-03 03:22:24 +02:00
Glenn Hermans b2fda6bea9
fixed order 2021-05-03 03:12:41 +02:00
Glenn Hermans e6c23a9810
Added missing params 2021-05-03 02:07:34 +02:00
Glenn Hermans 06803fa866
Updated php doc 2021-05-03 02:05:40 +02:00
Glenn Hermans 0f4da65937
Define custom order state on shipments 2021-05-03 02:03:28 +02:00
Glenn Hermans 5e48a85d9f
Merge pull request #19 from bagisto/master
Update fork
2021-05-03 02:00:49 +02:00
Glenn Hermans fb48f61497
Merge pull request #4836 from bagisto-europe/update_invoice_state
Define a custom invoice state
2021-05-02 20:17:27 +02:00
Glenn Hermans dbf8b9f384
added space 2021-05-02 20:01:27 +02:00
Glenn Hermans 9e2e54af5c
Merge pull request #4835 from bagisto-europe/update_order
Define a custom order status
2021-05-02 19:52:32 +02:00
Glenn Hermans 761263c0e7
Merge pull request #18 from bagisto-europe/update_order
fixed spacing
2021-05-02 19:52:17 +02:00
Glenn Hermans db505d5551
fixed spacing 2021-05-02 19:39:03 +02:00
Glenn Hermans 04aac03bbd
fixed #3453 2021-05-02 19:29:52 +02:00
Glenn Hermans 52206b582f
Added optional custom order status 2021-05-02 19:18:30 +02:00